summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2014-12-04 13:26:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-04 20:10:52 (GMT)
commitff7aa81f8971daf29826b3881e0e2df5bd7df90c (patch)
treee80cd355099fac83ba7ca9721256e3fb67b61e50
parent7fa1365c54c28b3cd9375539f381b54061a1880d (diff)
downloadgit-ff7aa81f8971daf29826b3881e0e2df5bd7df90c.zip
git-ff7aa81f8971daf29826b3881e0e2df5bd7df90c.tar.gz
git-ff7aa81f8971daf29826b3881e0e2df5bd7df90c.tar.bz2
t3200-branch: test -M
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3200-branch.sh9
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index ac31b71..c08aef4 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -97,6 +97,15 @@ test_expect_success 'git branch -m o/o o should fail when o/p exists' '
test_must_fail git branch -m o/o o
'
+test_expect_success 'git branch -m o/q o/p should fail when o/p exists' '
+ git branch o/q &&
+ test_must_fail git branch -m o/q o/p
+'
+
+test_expect_success 'git branch -M o/q o/p should work when o/p exists' '
+ git branch -M o/q o/p
+'
+
test_expect_success 'git branch -m q r/q should fail when r exists' '
git branch q &&
git branch r &&