diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 06:59:30 (GMT) |
| commit | 0657e0f802b0e0a97738c074dd27ee47eeb3366f (patch) | |
| tree | 3f07bb93ca6682e09a81939632647b3c70ab0b60 /sequencer.c | |
| parent | 6d2a655a4fd73865cc6233899219193e1d71f302 (diff) | |
| parent | 12f7babd6b68b14012f8beed42d82688c7e8f04a (diff) | |
| download | git-0657e0f802b0e0a97738c074dd27ee47eeb3366f.zip git-0657e0f802b0e0a97738c074dd27ee47eeb3366f.tar.gz git-0657e0f802b0e0a97738c074dd27ee47eeb3366f.tar.bz2 | |
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 5e3a50f..4ce5120 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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")); |