aboutsummaryrefslogtreecommitdiff
path: root/t/t3400-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-26 15:28:34 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-26 15:28:34 -0700
commitd1ab71804fe2afff4afa664c46a938a72fd237a7 (patch)
treeec51114efc56db221b29fc792c003fc3a8caa1db /t/t3400-rebase.sh
parent019eb0dd351ee53b875df27f6748bcb69dc02063 (diff)
parentea709800302ecae8c2fbb03af01e36b7f9b4d042 (diff)
downloadgit-d1ab71804fe2afff4afa664c46a938a72fd237a7.tar.gz
git-d1ab71804fe2afff4afa664c46a938a72fd237a7.tar.xz
Merge branch 'ph/rebase-original'
* ph/rebase-original: rebase: find orig_head unambiguously
Diffstat (limited to 't/t3400-rebase.sh')
-rwxr-xr-xt/t3400-rebase.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index f6cc10265..b58fa1a23 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -101,7 +101,14 @@ test_expect_success 'HEAD was detached during rebase' '
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
'
+test_expect_success 'rebase from ambiguous branch name' '
+ git checkout -b topic side &&
+ git rebase master
+'
+
test_expect_success 'rebase after merge master' '
+ git checkout --detach refs/tags/topic &&
+ git branch -D topic &&
git reset --hard topic &&
git merge master &&
git rebase master &&