diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-08 12:33:34 -0700 |
| commit | e85a43bc442d906b1cce112f154e54c216a0ab6e (patch) | |
| tree | 1092f265bca19d442c491d607b2c8c7bf0e87777 | |
| parent | Merge branch 'jn/gitweb-system-config' (diff) | |
| parent | Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. (diff) | |
| download | git-e85a43bc442d906b1cce112f154e54c216a0ab6e.tar.gz git-e85a43bc442d906b1cce112f154e54c216a0ab6e.zip | |
Merge branch 'js/ls-tree-error'
* 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.
| -rw-r--r-- | builtin/ls-tree.c | 4 | ||||
| -rwxr-xr-x | t/t3103-ls-tree-misc.sh | 24 |
2 files changed, 25 insertions, 3 deletions
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f08c5b0c94..6b666e1e87 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 new file mode 100755 index 0000000000..09dcf043fd --- /dev/null +++ b/t/t3103-ls-tree-misc.sh @@ -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 |