diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-11-03 23:32:28 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-11-03 23:32:29 +0300 |
| commit | 0cb1330bc6e71d5e489e98a596ffbc7a3fa36b18 (patch) | |
| tree | 79b55b063e4056573d98010291f05381b984f899 /sequencer.c | |
| parent | 36f0a2e20f3eeeaef8c356a4c9d27c3a5a5e13d0 (diff) | |
| parent | 9d6b9df128f842d2945e20e0760489ec6f3d2c0c (diff) | |
Merge branch 'pw/rebase-r-fixes'
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 cd2aabf1f7..ea96837cde 100644 --- a/sequencer.c +++ b/sequencer.c @@ -997,7 +997,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); |