From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:03:30 +0000 (-0700)
Subject: Merge branch 'jk/t6300-cleanup' into maint
X-Git-Tag: v2.12.2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7e02ec2c5d2e54df0300e5035fbb952e8dcf302c?hp=d6bc22e64b9572f72b2eb26fa1ce9d697d9d0d8e

Merge branch 'jk/t6300-cleanup' into maint

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
index aea1dfc714..a468041c50 100755
--- 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
 '