summaryrefslogtreecommitdiff
path: root/builtin/ls-tree.c
diff options
context:
space:
mode:
authorLibravatar Jon Seymour <jon.seymour@gmail.com>2011-07-25 00:59:14 +1000
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-07-25 10:50:11 -0700
commit04f89259a67ba1ec291f023b70278d41ed665a13 (patch)
treececd5e08d1a365c5940006832a7c5ef836bf291e /builtin/ls-tree.c
parentAdd a test to check that git ls-tree sets non-zero exit code on error. (diff)
downloadtgif-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>
Diffstat (limited to 'builtin/ls-tree.c')
-rw-r--r--builtin/ls-tree.c4
1 files changed, 1 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);
}