t5516: do not assume the "matching" push is the default

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

diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index b5417cc951b1cecbbde613fa572387f362e889d1..1a8753d2ebc3d7b8b494ca3d3a935f7b8bb0b7c0 100755 (executable)
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -247,7 +247,7 @@ test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf
 test_expect_success 'push with matching heads' '
 
        mk_test heads/master &&
 test_expect_success 'push with matching heads' '
 
        mk_test heads/master &&

-       git push testrepo &&
+       git push testrepo : &&

        check_push_result $the_commit heads/master
 
 '
        check_push_result $the_commit heads/master
 
 '


@@ -276,7 +276,7 @@ test_expect_success 'push --force with matching heads' '
        mk_test heads/master &&
        git push testrepo : &&
        git commit --amend -massaged &&
        mk_test heads/master &&
        git push testrepo : &&
        git commit --amend -massaged &&

-       git push --force testrepo &&
+       git push --force testrepo : &&

        ! check_push_result $the_commit heads/master &&
        git reset --hard $the_commit
 
        ! check_push_result $the_commit heads/master &&
        git reset --hard $the_commit
 


@@ -507,7 +507,7 @@ test_expect_success 'push with config remote.*.pushurl' '
        git checkout master &&
        git config remote.there.url test2repo &&
        git config remote.there.pushurl testrepo &&
        git checkout master &&
        git config remote.there.url test2repo &&
        git config remote.there.pushurl testrepo &&

-       git push there &&
+       git push there : &&

        check_push_result $the_commit heads/master
 '
 
        check_push_result $the_commit heads/master
 '
 


@@ -521,7 +521,7 @@ test_expect_success 'push with dry-run' '
                cd testrepo &&
                old_commit=$(git show-ref -s --verify refs/heads/master)
        ) &&
                cd testrepo &&
                old_commit=$(git show-ref -s --verify refs/heads/master)
        ) &&

-       git push --dry-run testrepo &&
+       git push --dry-run testrepo : &&

        check_push_result $old_commit heads/master
 '
 
        check_push_result $old_commit heads/master
 '
 


@@ -981,7 +981,7 @@ test_expect_success 'push --porcelain --dry-run rejected' '
 
 test_expect_success 'push --prune' '
        mk_test heads/master heads/second heads/foo heads/bar &&
 
 test_expect_success 'push --prune' '
        mk_test heads/master heads/second heads/foo heads/bar &&

-       git push --prune testrepo &&
+       git push --prune testrepo : &&

        check_push_result $the_commit heads/master &&
        check_push_result $the_first_commit heads/second &&
        ! check_push_result $the_first_commit heads/foo heads/bar
        check_push_result $the_commit heads/master &&
        check_push_result $the_first_commit heads/second &&
        ! check_push_result $the_first_commit heads/foo heads/bar