summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-10 13:24:22 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-10 13:24:22 -0800
commit11cfc0ef9674e55019047c0d4b4deb42877cee38 (patch)
tree18fa0b9be79c81c1eeaa8736b9e04b9753992750
parentMerge branch 'jk/parse-config-key-cleanup' (diff)
parentt6300: avoid creating refs/heads/HEAD (diff)
downloadtgif-11cfc0ef9674e55019047c0d4b4deb42877cee38.tar.xz
Merge branch 'jk/t6300-cleanup'
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
-rwxr-xr-xt/t6300-for-each-ref.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index c87dc1f8bc..834a9ed168 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -584,7 +584,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
'