From: Jens Lehmann <Jens.Lehmann@web.de>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails.
Date: Sun, 24 Jul 2011 15:42:06 +0200 [thread overview]
Message-ID: <4E2C212E.8000404@web.de> (raw)
In-Reply-To: <1311469670-15392-3-git-send-email-jon.seymour@gmail.com>
Am 24.07.2011 03:07, schrieb Jon Seymour:
> 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;
> }
Nit: Is it really necessary to introduce a new variable "err" for that? Looks
like a "return read_tree_recursive(...)" would suffice here ...
next prev parent reply other threads:[~2011-07-24 13:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-24 1:07 [PATCH 0/2 v2] ls-tree: exit with non-zero status on error Jon Seymour
2011-07-24 1:07 ` [PATCH 1/2] Add a test to check that git ls-tree sets non-zero exit code " Jon Seymour
2011-07-24 7:45 ` Junio C Hamano
2011-07-24 9:12 ` Jon Seymour
2011-07-24 1:07 ` [PATCH 2/2] Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails Jon Seymour
2011-07-24 7:45 ` Junio C Hamano
2011-07-24 13:42 ` Jens Lehmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-07-23 12:27 [PATCH 0/2] " Jon Seymour
2011-07-23 12:27 ` [PATCH 2/2] " 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=4E2C212E.8000404@web.de \
--to=jens.lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jon.seymour@gmail.com \
/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).