diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
| commit | 7e02ec2c5d2e54df0300e5035fbb952e8dcf302c (patch) | |
| tree | 8fffde665102f9310587f701278173fb0604050c | |
| parent | d6bc22e64b9572f72b2eb26fa1ce9d697d9d0d8e (diff) | |
| parent | f0252ca23c5c33765d189be4999254bf722a8b99 (diff) | |
| download | git-7e02ec2c5d2e54df0300e5035fbb952e8dcf302c.tar.gz | |
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
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 ' |