From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: phillip.wood@dunelm.org.uk,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Johannes Schindelin" <johannes.schindelin@gmx.de>,
"Git Mailing List" <git@vger.kernel.org>
Subject: Re: [RFC PATCH] ident: don't cache default date
Date: Thu, 19 Apr 2018 06:15:23 +0900 [thread overview]
Message-ID: <xmqqvacogqs4.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <d4aee85d-956f-ac93-b909-6dfeb5ea8fd7@kdbg.org> (Johannes Sixt's message of "Wed, 18 Apr 2018 20:15:04 +0200")
Johannes Sixt <j6t@kdbg.org> writes:
> While I like the basic theme of your patch, I think we should fix this
> case in a much simpler way, namely, use the infrastructure that was
> introduced for git-am.
Yup. reset_ident_date() was introduced by 4d9c7e6f ("am: reset
cached ident date for each patch", 2016-08-01) and the commit
explains very well why it is a good idea to have both the caching
and also the strategic resetting it introduces.
Thanks, all.
> I've shamelessly lifted the commit message from your patch.
>
> ---- 8< ----
> Subject: [PATCH] sequencer: reset the committer date before commits
>
> Now that the sequencer commits without forking when the commit message
> isn't edited all the commits that are picked have the same committer
> date. If a commit is reworded it's committer date will be a later time
> as it is created by running an separate instance of 'git commit'. If
> the reworded commit is follow by further picks, those later commits
> will have an earlier committer date than the reworded one. This is
> caused by git caching the default date used when GIT_COMMITTER_DATE is
> not set. Reset the cached date before a commit is generated
> in-process.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> sequencer.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/sequencer.c b/sequencer.c
> index f9d1001dee..f0bac903a0 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1148,6 +1148,8 @@ static int try_to_commit(struct strbuf *msg, const char *author,
> goto out;
> }
>
> + reset_ident_date();
> +
> if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
> oid, author, opts->gpg_sign, extra)) {
> res = error(_("failed to write commit object"));
next prev parent reply other threads:[~2018-04-18 21:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-13 16:52 Bug: rebase -i creates committer time inversions on 'reword' Johannes Sixt
2018-04-14 11:15 ` Phillip Wood
2018-04-14 13:11 ` Johannes Schindelin
2018-04-16 9:48 ` Phillip Wood
2018-04-19 9:17 ` Phillip Wood
2018-04-15 21:35 ` Junio C Hamano
2018-04-16 5:56 ` Johannes Sixt
2018-04-17 1:37 ` Junio C Hamano
2018-04-18 10:19 ` Phillip Wood
2018-04-18 10:22 ` [RFC PATCH] ident: don't cache default date Phillip Wood
2018-04-18 11:27 ` Ævar Arnfjörð Bjarmason
2018-04-18 17:47 ` Phillip Wood
2018-04-18 18:15 ` Johannes Sixt
2018-04-18 21:15 ` Junio C Hamano [this message]
2018-04-19 9:15 ` Phillip Wood
2018-04-20 8:11 ` Johannes Schindelin
2018-04-20 9:41 ` Phillip Wood
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=xmqqvacogqs4.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood@dunelm.org.uk \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.