* [PATCH v4 0/2] ls-tree: exit with non-zero status on error
@ 2011-07-25 22:03 Jon Seymour
2011-07-25 22:03 ` [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jon Seymour @ 2011-07-25 22:03 UTC (permalink / raw)
To: git; +Cc: Jens.Lehmann, pclouds, schwab, gitster, Jon Seymour
While working with a damaged repository, I noticed that git ls-tree was reporting an error
even though it set a zero exit code.
This patch uses the return code from read_tree_recursive instead.
| v2: Amended test per Jens Lehmann's suggestion.
| v3: Generalize name of test script (in response to Junio's comment).
| Removed unnecessary local variable, per Jens' comment.
| v4: Lexical simplification (Andreas, Junio), 0 or 1 exit code (Nguyen).
Jon Seymour (2):
Add a test to check that git ls-tree sets non-zero exit code on
error.
Ensure git ls-tree exits with a non-zero exit code if
read_tree_recursive fails.
builtin/ls-tree.c | 6 +++---
t/t3103-ls-tree-misc.sh | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
create mode 100755 t/t3103-ls-tree-missing-tree.sh
--
1.7.6.347.g6a5a9c
^ permalink raw reply [flat|nested] 4+ messages in thread* [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code on error. 2011-07-25 22:03 [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour @ 2011-07-25 22:03 ` Jon Seymour 2011-07-25 22:03 ` [v4 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails Jon Seymour 2011-07-25 22:05 ` [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour 2 siblings, 0 replies; 4+ messages in thread From: Jon Seymour @ 2011-07-25 22:03 UTC (permalink / raw) To: git; +Cc: Jens.Lehmann, pclouds, schwab, gitster, Jon Seymour Expected to fail at this commit, fixed by subsequent commit. Additional tests of adhoc or uncategorised nature should be added to this file. Improved-by: Jens Lehmann <Jens.Lehmann@web.de> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> --- t/t3103-ls-tree-misc.sh | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) create mode 100755 t/t3103-ls-tree-misc.sh diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh new file mode 100755 index 0000000..c9c20f9 --- /dev/null +++ b/t/t3103-ls-tree-misc.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +test_description=' +Miscellaneous tests for git ls-tree. + + 1. git ls-tree fails in presence of tree damage. + +' + +. ./test-lib.sh + +test_expect_success 'setup' ' + mkdir a && + touch a/one && + git add a/one && + git commit -m test +' + +test_expect_failure 'ls-tree fails with non-zero exit code on broken tree' ' + rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 && + test_must_fail git ls-tree -r HEAD +' + +test_done -- 1.7.6.347.g8394c ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [v4 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. 2011-07-25 22:03 [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour 2011-07-25 22:03 ` [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour @ 2011-07-25 22:03 ` Jon Seymour 2011-07-25 22:05 ` [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour 2 siblings, 0 replies; 4+ messages in thread From: Jon Seymour @ 2011-07-25 22:03 UTC (permalink / raw) To: git; +Cc: Jens.Lehmann, pclouds, schwab, gitster, Jon Seymour In the case of a corrupt repository, git ls-tree may report an error but presently it exits with a code of 0. This change sets the exit code to 1, if the read_tree_recursive returns non-zero and 0 otherwise. Improved-by: Jens Lehmann <Jens.Lehmann@web.de> Improved-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Improved-by: Andreas Schwab <schwab@linux-m68k.org> Improved-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> --- builtin/ls-tree.c | 3 +-- t/t3103-ls-tree-misc.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f08c5b0..b1dcebd 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -173,7 +173,6 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) tree = parse_tree_indirect(sha1); if (!tree) die("not a tree object"); - read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL); - return 0; + return !!read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL); } diff --git a/t/t3103-ls-tree-misc.sh b/t/t3103-ls-tree-misc.sh index c9c20f9..09dcf04 100755 --- a/t/t3103-ls-tree-misc.sh +++ b/t/t3103-ls-tree-misc.sh @@ -16,7 +16,7 @@ test_expect_success 'setup' ' git commit -m test ' -test_expect_failure 'ls-tree fails with non-zero exit code on broken tree' ' +test_expect_success 'ls-tree fails with non-zero exit code on broken tree' ' rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 && test_must_fail git ls-tree -r HEAD ' -- 1.7.6.347.g8394c ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4 0/2] ls-tree: exit with non-zero status on error 2011-07-25 22:03 [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour 2011-07-25 22:03 ` [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour 2011-07-25 22:03 ` [v4 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails Jon Seymour @ 2011-07-25 22:05 ` Jon Seymour 2 siblings, 0 replies; 4+ messages in thread From: Jon Seymour @ 2011-07-25 22:05 UTC (permalink / raw) To: git; +Cc: Jens.Lehmann, pclouds, schwab, gitster, Jon Seymour On Tue, Jul 26, 2011 at 8:03 AM, Jon Seymour <jon.seymour@gmail.com> wrote: > > This patch uses the return code from read_tree_recursive instead. Sorry, should be: This change sets the exit code to 1, if the read_tree_recursive returns non-zero and 0 otherwise. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-07-25 22:05 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-07-25 22:03 [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour 2011-07-25 22:03 ` [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour 2011-07-25 22:03 ` [v4 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails Jon Seymour 2011-07-25 22:05 ` [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).