Merge branch 'jk/t6300-cleanup' into maint

gitster · gitster · commit 7e02ec2c5d2e · 2017-03-21T15:03:30.000-07:00
A test that creates a confusing branch whose name is HEAD has been
corrected not to do so.

* jk/t6300-cleanup:
  t6300: avoid creating refs/heads/HEAD
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
@@ -558,7 +558,7 @@ test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
 	test_when_finished "git checkout master" &&
 	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
 	sed -e "s/^\* /  /" actual >expect &&
-	git checkout --orphan HEAD &&
+	git checkout --orphan orphaned-branch &&
 	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
 	test_cmp expect actual
 '

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,7 @@ test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '`
`558`	`558`	`test_when_finished "git checkout master" &&`
`559`	`559`	`git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&`
`560`	`560`	`sed -e "s/^\* / /" actual >expect &&`
`561`		`- git checkout --orphan HEAD &&`
	`561`	`+ git checkout --orphan orphaned-branch &&`
`562`	`562`	`git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&`
`563`	`563`	`test_cmp expect actual`
`564`	`564`	`'`