mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 09:26:10 +02:00
Code

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>
This commit is contained in:
Jon Seymour 2011-07-25 00:59:14 +10:00 committed by Junio C Hamano
parent 6c1c14480d
commit 04f89259a6
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/ls-tree.c
View File

@ -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
View File

@ -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
'