Merge branch 'pw/rebase-r-fixes' into maint

Regression fix.

* pw/rebase-r-fixes:
  rebase -i: fix rewording with --committer-date-is-author-date
This commit is contained in:
Junio C Hamano
2021-11-04 12:20:14 -07:00
2 changed files with 32 additions and 1 deletions

View File

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