[PATCH v3 1/7] t5505: fix "set-head --auto with ambiguous HEAD" test
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 18, 2013, 05:14 UTC
- Message-ID
- <1379481263-29903-2-git-send-email-gitster@pobox.com>
- 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