diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-17 15:45:45 -0700 |
| commit | 9a3a02b605ae58f5d61e48f213cf11bef3379739 (patch) | |
| tree | 2fa76b68458b835b031d2511049cfee3afa905cf /t/t3409-rebase-preserve-merges.sh | |
| parent | Merge branch 'es/rebase-i-respect-core-commentchar' into maint (diff) | |
| parent | rebase --preserve-merges: ignore "merge.log" config (diff) | |
| download | tgif-9a3a02b605ae58f5d61e48f213cf11bef3379739.tar.xz | |
Merge branch 'rt/rebase-p-no-merge-summary' into maint
* rt/rebase-p-no-merge-summary:
rebase --preserve-merges: ignore "merge.log" config
Diffstat (limited to 't/t3409-rebase-preserve-merges.sh')
| -rwxr-xr-x | t/t3409-rebase-preserve-merges.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh index 2e0c36415f..8c251c57a6 100755 --- a/t/t3409-rebase-preserve-merges.sh +++ b/t/t3409-rebase-preserve-merges.sh @@ -28,6 +28,8 @@ export GIT_AUTHOR_EMAIL # \--A3 <-- topic2 # \ # B2 <-- origin/topic +# +# Clone 4 (same as Clone 3) test_expect_success 'setup for merge-preserving rebase' \ 'echo First > A && @@ -64,6 +66,16 @@ test_expect_success 'setup for merge-preserving rebase' \ git merge --no-ff topic2 ) && + git clone ./. clone4 && + ( + cd clone4 && + git checkout -b topic2 origin/topic && + echo Sixth > A && + git commit -a -m "Modify A3" && + git checkout -b topic origin/topic && + git merge --no-ff topic2 + ) && + git checkout topic && echo Fourth >> B && git commit -a -m "Modify B2" @@ -96,4 +108,15 @@ test_expect_success 'rebase -p preserves no-ff merges' ' ) ' +test_expect_success 'rebase -p ignores merge.log config' ' + ( + cd clone4 && + git fetch && + git -c merge.log=1 rebase -p origin/topic && + echo >expected && + git log --format="%b" -1 >current && + test_cmp expected current + ) +' + test_done |