From: Johannes Sixt Date: Wed, 18 Apr 2018 18:15:04 +0000 (+0200) Subject: sequencer: reset the committer date before commits X-Git-Tag: v2.18.0-rc0~83^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12f7babd6b68b14012f8beed42d82688c7e8f04a;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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"));