diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-22 14:15:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-22 14:15:25 -0700 |
| commit | 1565b18791b4b27ab464764d37b86a673165ab07 (patch) | |
| tree | 96f42f3af22659c187c9a473d538aaa5ad737c1a | |
| parent | Merge branch 'ps/stash-push-pathspec-fix' (diff) | |
| parent | t3200: add test for single parameter passed to -m option (diff) | |
| download | tgif-1565b18791b4b27ab464764d37b86a673165ab07.tar.xz | |
Merge branch 'sd/t3200-branch-m-test'
New test.
* sd/t3200-branch-m-test:
t3200: add test for single parameter passed to -m option
| -rwxr-xr-x | t/t3200-branch.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 10f8f026ff..48d152b9a9 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -100,6 +100,23 @@ test_expect_success 'git branch -m n/n n should work' ' git reflog exists refs/heads/n ' +# The topmost entry in reflog for branch bbb is about branch creation. +# Hence, we compare bbb@{1} (instead of bbb@{0}) with aaa@{0}. + +test_expect_success 'git branch -m bbb should rename checked out branch' ' + test_when_finished git branch -D bbb && + test_when_finished git checkout master && + git checkout -b aaa && + git commit --allow-empty -m "a new commit" && + git rev-parse aaa@{0} >expect && + git branch -m bbb && + git rev-parse bbb@{1} >actual && + test_cmp expect actual && + git symbolic-ref HEAD >actual && + echo refs/heads/bbb >expect && + test_cmp expect actual +' + test_expect_success 'git branch -m o/o o should fail when o/p exists' ' git branch o/o && git branch o/p && |