aboutsummaryrefslogtreecommitdiff
path: root/t/t5516-fetch-push.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-04-23 05:21:45 -0400
committerJunio C Hamano <gitster@pobox.com>2008-04-23 10:56:07 -0700
commit3ef6a1fe95b0a5aaca21a86651850ef5d62327fa (patch)
tree45094856790f8bb4ae9620643e70e5cfbbce258a /t/t5516-fetch-push.sh
parent837f3b765840e789b73d3b08b38c0541cf8e324e (diff)
downloadgit-3ef6a1fe95b0a5aaca21a86651850ef5d62327fa.tar.gz
git-3ef6a1fe95b0a5aaca21a86651850ef5d62327fa.tar.xz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5516-fetch-push.sh')
-rwxr-xr-xt/t5516-fetch-push.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 9d2dc33cb..352e83bdc 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -178,19 +178,7 @@ test_expect_success 'push with weak ambiguity (2)' '
'
-test_expect_success 'push with ambiguity (1)' '
-
- mk_test remotes/origin/master remotes/frotz/master &&
- if git push testrepo master:master
- then
- echo "Oops, should have failed"
- false
- else
- check_push_result $the_first_commit remotes/origin/master remotes/frotz/master
- fi
-'
-
-test_expect_success 'push with ambiguity (2)' '
+test_expect_success 'push with ambiguity' '
mk_test heads/frotz tags/frotz &&
if git push testrepo master:frotz