Skip to content

Commit 3ef6a1f

Browse files
peffgitster
authored andcommitted
t5516: remove ambiguity test (1)
This test tried to push into a remote with ambiguous refs in remotes/$x/master and remotes/$y/master. However, the remote never actually tells us about the refs/remotes hierarchy, so we don't even see this ambiguity. The test happened to pass because we were simply looking for failure, and the test fails for another reason: the dst refspec does not exist and does not begin with refs/, making it invalid. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 837f3b7 commit 3ef6a1f

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

t/t5516-fetch-push.sh

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -178,19 +178,7 @@ test_expect_success 'push with weak ambiguity (2)' '
178178
179179
'
180180

181-
test_expect_success 'push with ambiguity (1)' '
182-
183-
mk_test remotes/origin/master remotes/frotz/master &&
184-
if git push testrepo master:master
185-
then
186-
echo "Oops, should have failed"
187-
false
188-
else
189-
check_push_result $the_first_commit remotes/origin/master remotes/frotz/master
190-
fi
191-
'
192-
193-
test_expect_success 'push with ambiguity (2)' '
181+
test_expect_success 'push with ambiguity' '
194182
195183
mk_test heads/frotz tags/frotz &&
196184
if git push testrepo master:frotz

0 commit comments

Comments
 (0)