From: Junio C Hamano <firstname.lastname@example.org>
To: Jonathan Nieder <email@example.com>
Cc: Lukas Gross <firstname.lastname@example.org>, email@example.com
Subject: Re: amend warnings with no changes staged
Date: Mon, 05 Aug 2019 20:53:00 -0700 [thread overview]
Message-ID: <firstname.lastname@example.org> (raw)
In-Reply-To: <email@example.com> (Junio C. Hamano's message of "Mon, 05 Aug 2019 20:29:42 -0700")
Junio C Hamano <firstname.lastname@example.org> writes:
> Jonathan Nieder <email@example.com> writes:
>>>> Some non-judgemental descriptive output like
>>>> $ git commit --amend --no-edit
>>>> No changes.
>>>> would address this case, without bothering people who are doing it
>>>> intentionally. So I think there's room for a simple improvement here.
>>> I do that to refresh the committer timestamp.
>> I do, too. The proposal is, paraphrasing,
>> $ git commit --amend --no-edit
>> Ah, I see that you want me to refresh the committer timestamp.
>> Done, as requested.
> Ah, OK then. I somehow misread "No changes." as an error message.
Well, on second thought, I think "fatal: no changes" that exits with
non-zero, with "--force" as an escape hatch for those who want to
refresh the committer timestamp, would probably be more in line with
the expectation Lukas had when this thread was started, and I further
suspect that it might be a bit more end-user friendly.
It is a backward incompatible behaviour, but I suspect that if I
were inventing "commit --amend" today, unlike 8588452c ("git-commit
--amend: allow empty commit.", 2006-03-04), I probably would design
it that way. After all, failing and stopping is always a safer
option than going ahead with or without a report.
I am not sure which one between "go ahead anyway but report" and
"fail by default but allow forcing" I would prefer more. At least
not yet. But I won't rule the latter out at this point.
next prev parent reply other threads:[~2019-08-06 3:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-06 0:28 amend warnings with no changes staged Lukas Gross
2019-08-06 1:30 ` Jonathan Nieder
2019-08-06 1:37 ` Lukas Gross
2019-08-06 2:01 ` Jonathan Nieder
2019-08-06 2:16 ` Jonathan Nieder
2019-08-06 2:47 ` Junio C Hamano
2019-08-06 3:00 ` Jonathan Nieder
2019-08-06 3:29 ` Junio C Hamano
2019-08-06 3:53 ` Junio C Hamano [this message]
2019-08-06 16:32 ` Phillip Wood
2019-08-06 4:19 ` Jeff King
2019-08-06 19:11 ` Junio C Hamano
2019-08-08 9:46 ` Jeff King
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:
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
* 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.
Code repositories for project(s) associated with this public inbox
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 read-only IMAP folder(s) and NNTP newsgroup(s).