From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Lukas Gross <lukasgross@u.northwestern.edu>, git@vger.kernel.org
Subject: Re: amend warnings with no changes staged
Date: Mon, 05 Aug 2019 19:47:38 -0700 [thread overview]
Message-ID: <xmqqtvavko1h.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190806021618.GC61803@google.com> (Jonathan Nieder's message of "Mon, 5 Aug 2019 19:16:18 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Lukas Gross wrote:
>
>> I had intended to stage commits but forgot to do so. Git responded
>> with a normal commit creation message, so I pushed to the remote to
>> begin a CI build. When the build failed for the same reason, I
>> realized I had forgotten to stage the changes. An additional line in
>> the response to the effect of “Warning: did you mean to amend with no
>> changes?” would be very helpful to shorten this feedback loop.
>
> On second thought:
>
> $ git commit --amend --no-edit
> [detached HEAD 33a3db8805] Git 2.23-rc1
> Author: Junio C Hamano <gitster@pobox.com>
> Date: Fri Aug 2 13:12:24 2019 -0700
> 2 files changed, 2 insertions(+), 1 deletion(-)
> $
>
> 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. Do I now have to say
something silly like
$ GIT_EDITOR=true git commit --amend
to defeat the above (mis)feature, or is there a cleaner workaround?
Obviously I'd prefer to see a solution that does not force existing
users to work around the new behaviour ;-)
> Care to take a stab at it? builtin/commit.c would be the place to
> start.
I'd suggest not to start it before we know what we want. I am not
yet convinced that "--amend --no-edit will become a no-op" is the
final solution we want.
next prev parent reply other threads:[~2019-08-06 2:47 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 [this message]
2019-08-06 3:00 ` Jonathan Nieder
2019-08-06 3:29 ` Junio C Hamano
2019-08-06 3:53 ` Junio C Hamano
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
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
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 \
--in-reply-to=xmqqtvavko1h.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=lukasgross@u.northwestern.edu \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).