summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:41:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-16 12:41:12 -0700
commit64b9db510986652a64227bb7370dbf8cc7f057ba (patch)
tree0d98f50ddc47910b96e87855108e3962bc76b1e6 /builtin
parentMerge branch 'jk/fast-export-quote-path' into maint (diff)
parentEnsure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. (diff)
downloadtgif-64b9db510986652a64227bb7370dbf8cc7f057ba.tar.xz
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.
Diffstat (limited to 'builtin')
-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);
}