git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Andreas Krey <a.krey@gmx.de>
Subject: [PATCH v3 1/7] t5505: fix "set-head --auto with ambiguous HEAD" test
Date: Tue, 17 Sep 2013 22:14:17 -0700	[thread overview]
Message-ID: <1379481263-29903-2-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1379481263-29903-1-git-send-email-gitster@pobox.com>

When two or more branches point at the same commit and HEAD is
pointing at one of them, without the symref extension, there is no
way to remotely tell which one of these branches HEAD points at.
The test in question attempts to make sure that this situation is
diagnosed and results in a failure.

However, even if there _were_ a way to reliably tell which branch
the HEAD points at, "set-head --auto" would fail if there is no
remote tracking branch.  Make sure that this test does not fail
for that "wrong" reason.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

 * New in this round.

 t/t5505-remote.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 8f6e392..197d3f7 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -271,6 +271,7 @@ EOF
 test_expect_success 'set-head --auto fails w/multiple HEADs' '
 	(
 		cd test &&
+		git fetch two "refs/heads/*:refs/remotes/two/*" &&
 		test_must_fail git remote set-head --auto two >output 2>&1 &&
 		test_i18ncmp expect output
 	)
-- 
1.8.4-585-g8d1dcaf

  reply	other threads:[~2013-09-18  5:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-18  5:14 [PATCH v3 0/7] Removing the guesswork of HEAD in "clone" Junio C Hamano
2013-09-18  5:14 ` Junio C Hamano [this message]
2013-09-18  5:14 ` [PATCH v3 2/7] upload-pack.c: do not pass confusing cb_data to mark_our_ref() Junio C Hamano
2013-09-18  5:14 ` [PATCH v3 3/7] upload-pack: send symbolic ref information as capability Junio C Hamano
2013-09-18  5:14 ` [PATCH v3 4/7] upload-pack: send non-HEAD symbolic refs Junio C Hamano
2013-09-18  5:14 ` [PATCH v3 5/7] connect.c: make parse_feature_value() static Junio C Hamano
2013-09-18  5:14 ` [PATCH v3 6/7] connect: annotate refs with their symref information in get_remote_head() Junio C Hamano
2013-09-18  5:14 ` [PATCH v3 7/7] clone: test the new HEAD detection logic Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1379481263-29903-2-git-send-email-gitster@pobox.com \
    --to=gitster@pobox.com \
    --cc=a.krey@gmx.de \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).