diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-04 12:20:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-04 12:20:14 -0700 |
| commit | ecb8d9d11ed97619f17e2c98d49409aa8127653f (patch) | |
| tree | 6907e165461733c77a40ac1dc85f4ea0f59dbdc2 /sequencer.c | |
| parent | Merge branch 'jk/log-warn-on-bogus-encoding' into maint (diff) | |
| parent | rebase -i: fix rewording with --committer-date-is-author-date (diff) | |
| download | git-ecb8d9d11ed97619f17e2c98d49409aa8127653f.tar.gz git-ecb8d9d11ed97619f17e2c98d49409aa8127653f.zip | |
Merge branch 'pw/rebase-r-fixes' into maint
Regression fix.
* pw/rebase-r-fixes:
rebase -i: fix rewording with --committer-date-is-author-date
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index e4627d9196..5c705f2ee0 100644 --- a/sequencer.c +++ b/sequencer.c @@ -983,7 +983,9 @@ static int run_git_commit(const char *defmsg, cmd.git_cmd = 1; - if (is_rebase_i(opts) && !(!defmsg && (flags & AMEND_MSG)) && + if (is_rebase_i(opts) && + ((opts->committer_date_is_author_date && !opts->ignore_date) || + !(!defmsg && (flags & AMEND_MSG))) && read_env_script(&cmd.env_array)) { const char *gpg_opt = gpg_sign_opt_quoted(opts); |