diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2019-05-02 11:22:49 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 10:33:43 +0900 |
| commit | 6df8df083109b1aa37824fc1ebe2347f887afe34 (patch) | |
| tree | a42a7136f874e9edebf44fc684a4501a5aaf913a /t | |
| parent | Git 2.22-rc0 (diff) | |
| download | tgif-6df8df083109b1aa37824fc1ebe2347f887afe34.tar.xz | |
rebase -r: always reword merge -c
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 42ba5b9f09..2315649f43 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)" && |