Browse Source

Merge branch 'js/ident-date-fix'

During a "rebase -i" session, the code could give older timestamp
to commits created by later "pick" than an earlier "reword", which
has been corrected.

* js/ident-date-fix:
  sequencer: reset the committer date before commits
maint
Junio C Hamano 7 years ago
parent
commit
0657e0f802
  1. 2
      sequencer.c

2
sequencer.c

@ -1149,6 +1149,8 @@ static int try_to_commit(struct strbuf *msg, const char *author, @@ -1149,6 +1149,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"));

Loading…
Cancel
Save