From: Jon Seymour Date: Sun, 24 Jul 2011 14:59:14 +0000 (+1000) Subject: Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. X-Git-Tag: v1.7.6.1~17^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=04f89259a67ba1ec291f023b70278d41ed665a13;p=git-core%2Fgit.git 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 Signed-off-by: Jon Seymour Signed-off-by: Junio C Hamano --- diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f08c5b0c9..6b666e1e8 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -173,7 +173,5 @@ 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 c9c20f95e..09dcf043f 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 '