Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
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 uses the return code of read_tree_recursive instead. Improved-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Jon Seymour <jon.seymour@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jon Seymour committed
Jul 25, 2011 at 00:59 UTC
04f89259a67ba1ec291f023b70278d41ed665a13
2 files changed
+2
-4
builtin/ls-tree.c
+1
-3
@@ -173,7 +173,5 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
173
tree = parse_tree_indirect(sha1);
174
if (!tree)
175
die("not a tree object");
176
- read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
177
-
178
- return 0;
176
+ return !!read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL);
177
}
t/t3103-ls-tree-misc.sh
+1
-1
@@ -16,7 +16,7 @@ test_expect_success 'setup' '
16
git commit -m test
17
'
18
19
-test_expect_failure 'ls-tree fails with non-zero exit code on broken tree' '
19
+test_expect_success 'ls-tree fails with non-zero exit code on broken tree' '
20
rm -f .git/objects/5f/cffbd6e4c5c5b8d81f5e9314b20e338e3ffff5 &&
21
test_must_fail git ls-tree -r HEAD
22
'