diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 12:41:12 -0700 |
| commit | 64b9db510986652a64227bb7370dbf8cc7f057ba (patch) | |
| tree | 0d98f50ddc47910b96e87855108e3962bc76b1e6 /builtin | |
| parent | 5480861c24b6f5830c2301ae2f50e21ef3cdeaf2 (diff) | |
| parent | 04f89259a67ba1ec291f023b70278d41ed665a13 (diff) | |
| download | git-64b9db510986652a64227bb7370dbf8cc7f057ba.tar.gz | |
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.c | 4 |
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); } |