mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/ls-tree-error' into maint
* js/ls-tree-error: Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. Add a test to check that git ls-tree sets non-zero exit code on error.
This commit is contained in:
commit
64b9db5109
|
@ -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);
|
||||
}
|
||||
|
|
24
t/t3103-ls-tree-misc.sh
Executable file
24
t/t3103-ls-tree-misc.sh
Executable file
|
@ -0,0 +1,24 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='
|
||||
Miscellaneous tests for git ls-tree.
|
||||
|
||||
1. git ls-tree fails in presence of tree damage.
|
||||
|
||||
'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
mkdir a &&
|
||||
touch a/one &&
|
||||
git add a/one &&
|
||||
git commit -m test
|
||||
'
|
||||
|
||||
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
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue