diff options
author | Michael J Gruber <git@drmicha.warpmail.net> | 2014-12-04 14:26:44 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-04 12:10:52 -0800 |
commit | ff7aa81f8971daf29826b3881e0e2df5bd7df90c (patch) | |
tree | e80cd355099fac83ba7ca9721256e3fb67b61e50 /t | |
parent | Merge branch 'nd/gitignore-trailing-whitespace' into maint (diff) | |
download | tgif-ff7aa81f8971daf29826b3881e0e2df5bd7df90c.tar.xz |
t3200-branch: test -M
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-x | t/t3200-branch.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index ac31b711f2..c08aef4abd 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 && |