diff options
author | Nanako Shiraishi <nanako3@lavabit.com> | 2010-01-07 20:05:02 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-01-07 11:14:39 -0800 |
commit | 9f21e97ddccf114a6919cf4b8cf57c2838328f36 (patch) | |
tree | 6096cbd783e73d10ca772012fef8289bce72f22c /t/t3415-rebase-onto-threedots.sh | |
parent | 61dfa1bb6710690e53fa20bc3ddd1f5fbe8c1d22 (diff) | |
download | git-9f21e97ddccf114a6919cf4b8cf57c2838328f36.tar.gz git-9f21e97ddccf114a6919cf4b8cf57c2838328f36.tar.xz |
rebase: fix --onto A...B parsing and add tests
The previous patch didn't parse "rebase --onto A...B" correctly when A
isn't an empty string. It also tried to be careful to notice a case in
which there are more than one merge bases, but forgot to give --all option
to merge-base, making the test pointless.
Fix these problems and add a test script to verify. Improvements to the
script to parse A...B syntax was taken from review comments by Johannes
Schindelin.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3415-rebase-onto-threedots.sh')
-rwxr-xr-x | t/t3415-rebase-onto-threedots.sh | 75 |
1 files changed, 75 insertions, 0 deletions
diff --git a/t/t3415-rebase-onto-threedots.sh b/t/t3415-rebase-onto-threedots.sh new file mode 100755 index 000000000..b09e907c3 --- /dev/null +++ b/t/t3415-rebase-onto-threedots.sh @@ -0,0 +1,75 @@ +#!/bin/sh + +test_description='git rebase --onto A...B' + +. ./test-lib.sh +. "$TEST_DIRECTORY/lib-rebase.sh" + +# Rebase only the tip commit of "topic" on merge base between "master" +# and "topic". Cannot do this for "side" with "master" because there +# is no single merge base. +# +# +# F---G topic G' +# / / +# A---B---C---D---E master --> A---B---C---D---E +# \ \ / +# \ x +# \ / \ +# H---I---J---K side + +test_expect_success setup ' + test_commit A && + test_commit B && + git branch side && + test_commit C && + git branch topic && + git checkout side && + test_commit H && + git checkout master && + test_tick && + git merge H && + git tag D && + test_commit E && + git checkout topic && + test_commit F && + test_commit G && + git checkout side && + test_tick && + git merge C && + git tag I && + test_commit J && + test_commit K +' + +test_expect_success 'rebase --onto master...topic' ' + git reset --hard && + git checkout topic && + git reset --hard G && + + git rebase --onto master...topic F && + git rev-parse HEAD^1 >actual && + git rev-parse C^0 >expect && + test_cmp expect actual +' + +test_expect_success 'rebase --onto master...' ' + git reset --hard && + git checkout topic && + git reset --hard G && + + git rebase --onto master... F && + git rev-parse HEAD^1 >actual && + git rev-parse C^0 >expect && + test_cmp expect actual +' + +test_expect_success 'rebase --onto master...side' ' + git reset --hard && + git checkout side && + git reset --hard K && + + test_must_fail git rebase --onto master...side J +' + +test_done |