git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jon Seymour <jon.seymour@gmail.com>
To: git@vger.kernel.org
Cc: Jens.Lehmann@web.de, pclouds@gmail.com, schwab@linux-m68k.org,
	gitster@pobox.com, Jon Seymour <jon.seymour@gmail.com>
Subject: [v4 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
Date: Tue, 26 Jul 2011 08:03:11 +1000	[thread overview]
Message-ID: <1311631391-12842-3-git-send-email-jon.seymour@gmail.com> (raw)
In-Reply-To: <1311631391-12842-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 sets the exit code to 1, if the read_tree_recursive returns
non-zero and 0 otherwise.

Improved-by: Jens Lehmann <Jens.Lehmann@web.de>
Improved-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com>
Improved-by: Andreas Schwab <schwab@linux-m68k.org>
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
---
 builtin/ls-tree.c       |    3 +--
 t/t3103-ls-tree-misc.sh |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index f08c5b0..b1dcebd 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -173,7 +173,6 @@ 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 c9c20f9..09dcf04 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
 '
-- 
1.7.6.347.g8394c

  parent reply	other threads:[~2011-07-25 22:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-25 22:03 [PATCH v4 0/2] ls-tree: exit with non-zero status on error Jon Seymour
2011-07-25 22:03 ` [v4 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour
2011-07-25 22:03 ` Jon Seymour [this message]
2011-07-25 22:05 ` [PATCH v4 0/2] ls-tree: exit with non-zero status " Jon Seymour

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1311631391-12842-3-git-send-email-jon.seymour@gmail.com \
    --to=jon.seymour@gmail.com \
    --cc=Jens.Lehmann@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pclouds@gmail.com \
    --cc=schwab@linux-m68k.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).