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@xxxxxx>
Improved-by: Nguyen Thai Ngoc Duy <pclouds@xxxxxxxxx>
Improved-by: Andreas Schwab <schwab@xxxxxxxxxxxxxx>
Improved-by: Junio C Hamano <gitster@xxxxxxxxx>
Signed-off-by: Jon Seymour <jon.seymour@xxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html