From: Junio C Hamano <gitster@pobox•com>
To: John Keeping <john@keeping•me.uk>
Cc: git@vger•kernel.org, Daniel Hahler <genml+git-2014@thequod•de>
Subject: Re: [PATCH] rev-parse: fix --resolve-git-dir argument handling
Date: Tue, 18 Feb 2014 12:42:02 -0800 [thread overview]
Message-ID: <xmqq61ocdug5.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <65ea2c8ce4f0d60f0d93f730aac50183ba63bd1c.1392626780.git.john@keeping.me.uk> (John Keeping's message of "Mon, 17 Feb 2014 08:46:20 +0000")
John Keeping <john@keeping•me.uk> writes:
> There are two problems here:
>
> 1) If no argument is provided, then the command segfaults
> 2) The argument is not consumed, so there will be excess output
>
> Fix both of these in one go by restructuring the handler for this
> option.
>
> Reported-by: Daniel Hahler <genml+git-2014@thequod•de>
> Signed-off-by: John Keeping <john@keeping•me.uk>
> ---
Looks sensible; thanks.
> builtin/rev-parse.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index aaeb611..645cc4a 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -738,9 +738,12 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
> continue;
> }
> if (!strcmp(arg, "--resolve-git-dir")) {
> - const char *gitdir = resolve_gitdir(argv[i+1]);
> + const char *gitdir;
> + if (++i >= argc)
> + die("--resolve-git-dir requires an argument");
> + gitdir = resolve_gitdir(argv[i]);
> if (!gitdir)
> - die("not a gitdir '%s'", argv[i+1]);
> + die("not a gitdir '%s'", argv[i]);
> puts(gitdir);
> continue;
> }
next prev parent reply other threads:[~2014-02-18 20:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-17 8:13 Output from "rev-parse --resolve-git-dir" changed: two lines (prints original argument) Daniel Hahler
2014-02-17 8:46 ` [PATCH] rev-parse: fix --resolve-git-dir argument handling John Keeping
2014-02-18 20:42 ` Junio C Hamano [this message]
2014-02-19 0:25 ` Junio C Hamano
2014-02-19 9:09 ` John Keeping
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=xmqq61ocdug5.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=genml+git-2014@thequod$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=john@keeping$(echo .)me.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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