Re: [PATCH v2] t3200: add test for single parameter passed to -m option
From: Junio C Hamano <hidden>
Date: 2017-06-12 15:16:32
Sahil Dua [off-list ref] writes:
quoted hunk
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, 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. Signed-off-by: Sahil Dua <redacted> --- t/t3200-branch.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+)diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fe62e7c775da6..720400c0e42af 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh@@ -100,6 +100,20 @@ test_expect_success 'git branch -m n/n n should work' ' git reflog exists refs/heads/n ' +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 &&
I think future readers of this test would appreciate if there were
some comment explaining why aaa@{0} and bbb@{1} (not bbb@{0}) are
expected to be the same here.
+ 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 && -- https://github.com/git/git/pull/371
Other than that, looks sensible to me. Thanks.