diff options
| author | Jon Seymour <jon.seymour@gmail.com> | 2011-07-25 00:59:14 +1000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-25 10:50:11 -0700 |
| commit | 04f89259a67ba1ec291f023b70278d41ed665a13 (patch) | |
| tree | cecd5e08d1a365c5940006832a7c5ef836bf291e | |
| parent | 6c1c14480ddf912fca5e09a6a7e66dee7793d2ea (diff) | |
| download | git-04f89259a67ba1ec291f023b70278d41ed665a13.tar.gz git-04f89259a67ba1ec291f023b70278d41ed665a13.tar.xz | |
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>
| -rw-r--r-- | builtin/ls-tree.c | 4 | ||||
| -rwxr-xr-x | t/t3103-ls-tree-misc.sh | 2 |
2 files changed, 2 insertions, 4 deletions
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 ' |