From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Jun 2019 20:19:43 +0000 (-0700)
Subject: Merge branch 'pw/rebase-edit-message-for-replayed-merge'
X-Git-Tag: v2.23.0-rc0~128
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c51026115481834a1e0f49a2dafc1ce86025889c?ds=sidebyside;hp=-c

Merge branch 'pw/rebase-edit-message-for-replayed-merge'

A "merge -c" instruction during "git rebase --rebase-merges" should
give the user a chance to edit the log message, even when there is
otherwise no need to create a new merge and replace the existing
one (i.e. fast-forward instead), but did not.  Which has been
corrected.

* pw/rebase-edit-message-for-replayed-merge:
rebase -r: always reword merge -c
---

c51026115481834a1e0f49a2dafc1ce86025889c
diff --combined sequencer.c
index 334de14542,9acf458635..ab74b6baf1
--- a/sequencer.c
+++ b/sequencer.c
@@@ -767,7 -767,7 +767,7 @@@ static int parse_key_value_squoted(cha
   *	GIT_AUTHOR_DATE='$author_date'
   *
   * where $author_name, $author_email and $author_date are quoted. We are strict
 - * with our parsing, as the file was meant to be eval'd in the old
 + * with our parsing, as the file was meant to be eval'd in the now-removed
   * git-am.sh/git-rebase--interactive.sh scripts, and thus if the file differs
   * from what this function expects, it is better to bail out than to do
   * something that the user does not expect.
@@@ -3401,6 -3401,10 +3401,10 @@@ static int do_merge(struct repository *
  		rollback_lock_file(&lock);
  		ret = fast_forward_to(r, &commit->object.oid,
  				      &head_commit->object.oid, 0, opts);
+ 		if (flags & TODO_EDIT_MERGE_MSG) {
+ 			run_commit_flags |= AMEND_MSG;
+ 			goto fast_forward_edit;
+ 		}
  		goto leave_merge;
  	}
  
@@@ -3504,6 -3508,7 +3508,7 @@@
  		 * value (a negative one would indicate that the `merge`
  		 * command needs to be rescheduled).
  		 */
+ 	fast_forward_edit:
  		ret = !!run_git_commit(r, git_path_merge_msg(r), opts,
  				       run_commit_flags);