Skip to content

Commit 0657e0f

Browse files
committed
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
2 parents 6d2a655 + 12f7bab commit 0657e0f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

sequencer.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1149,6 +1149,8 @@ static int try_to_commit(struct strbuf *msg, const char *author,
11491149
goto out;
11501150
}
11511151

1152+
reset_ident_date();
1153+
11521154
if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
11531155
oid, author, opts->gpg_sign, extra)) {
11541156
res = error(_("failed to write commit object"));

0 commit comments

Comments
 (0)