diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-17 21:45:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-17 21:45:34 -0700 |
| commit | a4dfee06806df64b7a44866f67f15b54567ec722 (patch) | |
| tree | 483404c20e3cacd6535ad9af923cf9260af6eecd | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-a4dfee06806df64b7a44866f67f15b54567ec722.tar.gz git-a4dfee06806df64b7a44866f67f15b54567ec722.tar.xz | |
t5505: fix "set-head --auto with ambiguous HEAD" test
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>
| -rwxr-xr-x | t/t5505-remote.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 8f6e3922d..197d3f763 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 ) |