[PATCH 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
- From
Jon Seymour <jon.seymour@gmail.com>
- Date
- Jul 24, 2011, 01:07 UTC
- Message-ID
- <1311469670-15392-3-git-send-email-jon.seymour@gmail.com>
- In-Reply-To
- <1311469670-15392-1-git-send-email-jon.seymour@gmail.com>
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> --- builtin/ls-tree.c | 6 +++--- t/t3103-ls-tree-missing-tree.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c index f08c5b0..6d6c992 100644 --- a/builtin/ls-tree.c +++ b/builtin/ls-tree.c @@ -120,7 +120,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix) { unsigned char sha1[20]; struct tree *tree; - int i, full_tree = 0; + int i, full_tree = 0, err; const struct option ls_tree_options[] = { OPT_BIT('d', NULL, &ls_options, "only show trees", LS_TREE_ONLY), @@ -173,7 +173,7 @@ 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); + err = read_tree_recursive(tree, "", 0, 0, &pathspec, show_tree, NULL); - return 0; + return err; } diff --git a/t/t3103-ls-tree-missing-tree.sh b/t/t3103-ls-tree-missing-tree.sh index cd17fa7..365ac07 100755 --- a/t/t3103-ls-tree-missing-tree.sh +++ b/t/t3103-ls-tree-missing-tree.sh @@ -11,7 +11,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 '
-- 1.7.6.347.g96e0b