git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [Bug?] "git commit --amend" always gives author-date to summary?
Date: Thu, 14 Apr 2016 22:03:01 -0400	[thread overview]
Message-ID: <20160415020300.GA22112@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqqh9f3gaqh.fsf@gitster.mtv.corp.google.com>

On Thu, Apr 14, 2016 at 02:07:50PM -0700, Junio C Hamano wrote:

> A simple reproduction.  Doing one of these
> 
>     $ git commit --amend --no-edit
>     $ echo >MSG frotz; git commit --amend -F MSG
> 
> on any commit, whether it is your own commit or somebody else's,
> seems to always show the "Date:" of the original commit, e.g.
> 
>     $ git checkout v2.8.0^0
>     $ git commit --amend --no-edit
>     [detached HEAD a6f2a14] Git 2.8
>      Date: Mon Mar 28 12:19:45 2016 -0700
>      3 files changed, 14 insertions(+), 9 deletions(-)
>     $ git checkout v2.8.0^^2
>     $ git commit --amend --no-edit
>     [detached HEAD df9f57e] Documentation: fix git-p4 AsciiDoc formatting
>      Author: Lars Schneider <larsxschneider@gmail.com>
>      Date: Wed Mar 23 11:59:01 2016 +0100
>      1 file changed, 3 insertions(+), 5 deletions(-)
> 
> I can understand the latter, but I am not sure if it makes sense to
> do the former.  The output is coming from b7242b8c (commit: print
> "Date" line when the user has set date, 2014-05-01), whose objective
> I can agree with, but does not seem to match the use case.

That's working as I intended it in both cases. The point is to show
extra information whenever we have picked an ident or date that is not
the "normal" one. As you noted later, leaving the old author date is the
normal thing for "--amend", but it's still different from a normal
commit that uses the current user and the current date. So I guess it
depends on how you define normal.

IMHO, we are better off generally erring on the side of printing extra
information. The command is already quite chatty, and we are more likely
to remind somebody that they wanted "--reset-author" than to bother
thing.

> [...]
> I suspect that there are people who are already depending on this
> behaviour, so it may not be worth fixing, but I found it somewhat
> irritating (especially after wasting about an hour or so doing wild
> goose chase trying to find a stray invocation of "date" somewhere in
> my script that eventually uses "git commit --amend").
> 
> Thoughts?

So I don't agree that is a "fix" to change it. But if it bothers you, I
don't mind a knob to suppress it in certain cases.

-Peff

  reply	other threads:[~2016-04-15  2:03 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14 21:07 [Bug?] "git commit --amend" always gives author-date to summary? Junio C Hamano
2016-04-15  2:03 ` Jeff King [this message]
2016-04-15  2:13   ` Junio C Hamano

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=20160415020300.GA22112@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).