Browse Source

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>
maint
Jon Seymour 14 years ago committed by Junio C Hamano
parent
commit
04f89259a6
  1. 4
      builtin/ls-tree.c
  2. 2
      t/t3103-ls-tree-misc.sh

4
builtin/ls-tree.c

@ -173,7 +173,5 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) @@ -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);
}

2
t/t3103-ls-tree-misc.sh

@ -16,7 +16,7 @@ test_expect_success 'setup' ' @@ -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
'

Loading…
Cancel
Save