From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] commit: improve error message in "-a <paths>" case
Date: Thu, 21 Mar 2019 14:49:52 +0900 [thread overview]
Message-ID: <xmqqh8bwsrnj.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190320102906.12917-1-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Wed, 20 Mar 2019 17:29:06 +0700")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> I did something stupid today and got
>
> $ git commit -a --fixup= @^
> fatal: Paths with -a does not make sense.
>
> which didn't make any sense (at least for the first few seconds).
>
> Include the first path(spec) in the error message to help spot the
> problem quicker. Now it shows
>
> fatal: paths '@^ ...' with -a does not make sense
>
> which should ring some bell because @^ should clearly not be considered
> a path.
Makes sort of sense. Would it break to blindly use argv[0] if the
user had an explicit double-dash "--" disambiguator?
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
> builtin/commit.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/builtin/commit.c b/builtin/commit.c
> index f17537474a..7f9aa032b6 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1194,7 +1194,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
> handle_untracked_files_arg(s);
>
> if (all && argc > 0)
> - die(_("Paths with -a does not make sense."));
> + die(_("paths '%s ...' with -a does not make sense"),
> + argv[0]);
>
> if (status_format != STATUS_FORMAT_NONE)
> dry_run = 1;
next prev parent reply other threads:[~2019-03-21 5:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-20 10:29 [PATCH] commit: improve error message in "-a <paths>" case Nguyễn Thái Ngọc Duy
2019-03-21 5:49 ` Junio C Hamano [this message]
2019-03-21 9:42 ` Duy Nguyen
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=xmqqh8bwsrnj.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pclouds@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).