@matheusbsbs / matheus-bagliano / commits / bb8efa1772

t3200: add test for single parameter passed to -m option

Add a test for the case when only one parameter is passed to '-m' (move/rename) option. For example - if 'git branch -m bbb' is run while checked out on aaa branch, it should rename the currently checked out branch to bbb. There was no test for this particular case with only one parameter for -m option. However, there's one similar test case for -M option. Add test for making sure HEAD points to the bbb (new branch name). Also add a test for making sure the reflog that is moved to 'bbb' retains entries created for the currently checked out branch. Note that since the topmost entry on reflog for bbb will be about branch creation, we compare bbb@{1} (instead of bbb@{0}) with aaa@{0} to make sure the reflog for bbb retains entries from aaa. Signed-off-by: Sahil Dua <sahildua2305@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Sahil Dua committed Jun 13, 2017 at 10:47 UTC bb8efa1772c5a2ae1ce13ee2482fc8d97011ab7a
1 file changed +17
t/t3200-branch.sh
+17
@@ -100,6 +100,23 @@ test_expect_success 'git branch -m n/n n should work' '
100 git reflog exists refs/heads/n
101 '
102
103 +# The topmost entry in reflog for branch bbb is about branch creation.
104 +# Hence, we compare bbb@{1} (instead of bbb@{0}) with aaa@{0}.
105 +
106 +test_expect_success 'git branch -m bbb should rename checked out branch' '
107 + test_when_finished git branch -D bbb &&
108 + test_when_finished git checkout master &&
109 + git checkout -b aaa &&
110 + git commit --allow-empty -m "a new commit" &&
111 + git rev-parse aaa@{0} >expect &&
112 + git branch -m bbb &&
113 + git rev-parse bbb@{1} >actual &&
114 + test_cmp expect actual &&
115 + git symbolic-ref HEAD >actual &&
116 + echo refs/heads/bbb >expect &&
117 + test_cmp expect actual
118 +'
119 +
120 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
121 git branch o/o &&
122 git branch o/p &&