| Message ID | 20190502102249.9071-1-phillip.wood123@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] rebase -r: always reword merge -c | expand |
Hi Phillip, On Thu, 2 May 2019, Phillip Wood wrote: > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > If a merge can be fast-forwarded then make sure that we still edit the > commit message if the user specifies -c. The implementation follows the > same pattern that is used for ordinary rewords that are fast-forwarded. > > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- ACK! Thank you, Dscho
Hi Junio, I think this one fell through the cracks (at least I failed to find it in `pu`), but I deem it a bug fix worthy of including in v2.22.0. Ciao, Dscho On Thu, 2 May 2019, Phillip Wood wrote: > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > If a merge can be fast-forwarded then make sure that we still edit the > commit message if the user specifies -c. The implementation follows the > same pattern that is used for ordinary rewords that are fast-forwarded. > > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- > Thanks to Dscho for his comments on v1, I've changed the test as he suggested. > > Range-diff: > 1: 0532b70644 ! 1: 738799241a rebase -r: always reword merge -c > @@ -40,9 +40,12 @@ > > +test_expect_success 'fast-forward merge -c still rewords' ' > + git checkout -b fast-forward-merge-c H && > -+ set_fake_editor && > -+ FAKE_COMMIT_MESSAGE=edited GIT_SEQUENCE_EDITOR="echo merge -c H G >" \ > -+ git rebase -ir @^ && > ++ ( > ++ set_fake_editor && > ++ FAKE_COMMIT_MESSAGE=edited \ > ++ GIT_SEQUENCE_EDITOR="echo merge -c H G >" \ > ++ git rebase -ir @^ > ++ ) && > + echo edited >expected && > + git log --pretty=format:%B -1 >actual && > + test_cmp expected actual > > sequencer.c | 5 +++++ > t/t3430-rebase-merges.sh | 13 +++++++++++++ > 2 files changed, 18 insertions(+) > > diff --git a/sequencer.c b/sequencer.c > index 0db410d590..ff8565e7a8 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -3248,6 +3248,10 @@ static int do_merge(struct repository *r, > 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; > } > > @@ -3351,6 +3355,7 @@ static int do_merge(struct repository *r, > * 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); > > diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh > index 4c69255ee6..01238d4b6e 100755 > --- a/t/t3430-rebase-merges.sh > +++ b/t/t3430-rebase-merges.sh > @@ -164,6 +164,19 @@ test_expect_success 'failed `merge <branch>` does not crash' ' > grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message > ' > > +test_expect_success 'fast-forward merge -c still rewords' ' > + git checkout -b fast-forward-merge-c H && > + ( > + set_fake_editor && > + FAKE_COMMIT_MESSAGE=edited \ > + GIT_SEQUENCE_EDITOR="echo merge -c H G >" \ > + git rebase -ir @^ > + ) && > + echo edited >expected && > + git log --pretty=format:%B -1 >actual && > + test_cmp expected actual > +' > + > test_expect_success 'with a branch tip that was cherry-picked already' ' > git checkout -b already-upstream master && > base="$(git rev-parse --verify HEAD)" && > -- > 2.21.0 > > >
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: > I think this one fell through the cracks (at least I failed to find it in > `pu`), Thanks, I think I was waiting for an Ack or two, but then the thread was buried.
diff --git a/sequencer.c b/sequencer.c index 0db410d590..ff8565e7a8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3248,6 +3248,10 @@ static int do_merge(struct repository *r, 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; } @@ -3351,6 +3355,7 @@ static int do_merge(struct repository *r, * 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); diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 4c69255ee6..01238d4b6e 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -164,6 +164,19 @@ test_expect_success 'failed `merge <branch>` does not crash' ' grep "^Merge branch ${SQ}G${SQ}$" .git/rebase-merge/message ' +test_expect_success 'fast-forward merge -c still rewords' ' + git checkout -b fast-forward-merge-c H && + ( + set_fake_editor && + FAKE_COMMIT_MESSAGE=edited \ + GIT_SEQUENCE_EDITOR="echo merge -c H G >" \ + git rebase -ir @^ + ) && + echo edited >expected && + git log --pretty=format:%B -1 >actual && + test_cmp expected actual +' + test_expect_success 'with a branch tip that was cherry-picked already' ' git checkout -b already-upstream master && base="$(git rev-parse --verify HEAD)" &&