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
This commit is contained in:
Junio C Hamano 2018-05-08 15:59:30 +09:00
Родитель 6d2a655a4f 12f7babd6b
Коммит 0657e0f802
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -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"));