From 2f9ae5fc4443afc6fbdeafcc20e1e3e27bbd7a19 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:04:22 -0800 Subject: t5404: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5404-tracking-branches.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh index c24003565d..2b8c0bac7d 100755 --- a/t/t5404-tracking-branches.sh +++ b/t/t5404-tracking-branches.sh @@ -36,7 +36,7 @@ test_expect_success 'prepare pushable branches' ' ' test_expect_success 'mixed-success push returns error' ' - test_must_fail git push + test_must_fail git push origin : ' test_expect_success 'check tracking branches updated correctly after push' ' -- cgit v1.2.3 From f10b7fcca6f7ae63b8c1b65ea520f226869836e7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:06:09 -0800 Subject: t5505: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5505-remote.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index ccc55ebf4b..6579a86724 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -345,7 +345,7 @@ test_expect_success 'fetch mirrors do not act as mirrors during push' ' ) && (cd mirror-fetch/child && git branch -m renamed renamed2 && - git push parent + git push parent : ) && (cd mirror-fetch/parent && git rev-parse --verify renamed && -- cgit v1.2.3 From 0a42ac033115c752fd984373e4a70f10aee1a65f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:08:26 -0800 Subject: t5516: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5516-fetch-push.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index b5417cc951..1a8753d2eb 100755 --- 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 && - git push testrepo && + git push testrepo : && 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 && - git push --force testrepo && + git push --force testrepo : && ! 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 push there && + git push there : && 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) ) && - git push --dry-run testrepo && + git push --dry-run testrepo : && 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 && - 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 -- cgit v1.2.3 From 93912fdd5e253166287e1ef7ed4b26ea6f8e906d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:09:15 -0800 Subject: t5517: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5517-push-mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh index e2ad260508..12a5dfb17e 100755 --- a/t/t5517-push-mirror.sh +++ b/t/t5517-push-mirror.sh @@ -256,7 +256,7 @@ test_expect_success 'remote.foo.mirror=no has no effect' ' git branch keep master && git push --mirror up && git branch -D keep && - git push up + git push up : ) && ( cd mirror && -- cgit v1.2.3 From f3258d3d95cc9e0a3fe6255df8b72b444545c0aa Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:10:18 -0800 Subject: t5519: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5519-push-alternates.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh index c00c9b071d..11fcd37700 100755 --- a/t/t5519-push-alternates.sh +++ b/t/t5519-push-alternates.sh @@ -40,7 +40,7 @@ test_expect_success 'alice works and pushes' ' cd alice-work && echo more >file && git commit -a -m second && - git push ../alice-pub + git push ../alice-pub : ) ' @@ -57,7 +57,7 @@ test_expect_success 'bob fetches from alice, works and pushes' ' git pull ../alice-pub master && echo more bob >file && git commit -a -m third && - git push ../bob-pub + git push ../bob-pub : ) && # Check that the second commit by Alice is not sent @@ -86,7 +86,7 @@ test_expect_success 'alice works and pushes again' ' cd alice-work && echo more alice >file && git commit -a -m fourth && - git push ../alice-pub + git push ../alice-pub : ) ' @@ -99,7 +99,7 @@ test_expect_success 'bob works and pushes' ' cd bob-work && echo yet more bob >file && git commit -a -m fifth && - git push ../bob-pub + git push ../bob-pub : ) ' @@ -115,7 +115,7 @@ test_expect_success 'alice works and pushes yet again' ' git commit -a -m sixth.2 && echo more and more alice >>file && git commit -a -m sixth.3 && - git push ../alice-pub + git push ../alice-pub : ) ' @@ -136,7 +136,7 @@ test_expect_success 'bob works and pushes again' ' git hash-object -t commit -w commit && echo even more bob >file && git commit -a -m seventh && - git push ../bob-pub + git push ../bob-pub : ) ' -- cgit v1.2.3 From 43eb92021058d899a8027128a11326310551c7cf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:17:10 -0800 Subject: t5531: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t5531-deep-submodule-push.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh index 1947c28c64..8c16e045a0 100755 --- a/t/t5531-deep-submodule-push.sh +++ b/t/t5531-deep-submodule-push.sh @@ -16,6 +16,7 @@ test_expect_success setup ' ( cd gar/bage && git init && + git config push.default matching && >junk && git add junk && git commit -m "Initial junk" -- cgit v1.2.3 From ae74f7d2895121b0931c575173e81a35e8893995 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:19:19 -0800 Subject: t7406: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t7406-submodule-update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index feaec6cdf4..c675ce6297 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -565,14 +565,14 @@ test_expect_success 'submodule add places git-dir in superprojects git-dir recur git log > ../../../expected ) && git commit -m "added subsubmodule" && - git push + git push origin : ) && (cd .git/modules/deeper/submodule/modules/subsubmodule && git log > ../../../../../actual ) && git add deeper/submodule && git commit -m "update submodule" && - git push && + git push origin : && test_cmp actual expected ) ' -- cgit v1.2.3 From a1c54d7b8d07143044a52a7d90f4ea87d52708c7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:22:26 -0800 Subject: t9400: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t9400-git-cvsserver-server.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh index 9502f2438a..043138631b 100755 --- a/t/t9400-git-cvsserver-server.sh +++ b/t/t9400-git-cvsserver-server.sh @@ -36,6 +36,7 @@ export CVSROOT CVS_SERVER rm -rf "$CVSWORK" "$SERVERDIR" test_expect_success 'setup' ' + git config push.default matching && echo >empty && git add empty && git commit -q -m "First Commit" && -- cgit v1.2.3 From e2a83b21d1aa749766e7823707a85235456a763a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 4 Jan 2013 16:24:32 -0800 Subject: t9401: do not assume the "matching" push is the default Signed-off-by: Junio C Hamano --- t/t9401-git-cvsserver-crlf.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh index 1c5bc84fa7..8c3db76301 100755 --- a/t/t9401-git-cvsserver-crlf.sh +++ b/t/t9401-git-cvsserver-crlf.sh @@ -84,6 +84,7 @@ export CVSROOT CVS_SERVER rm -rf "$CVSWORK" "$SERVERDIR" test_expect_success 'setup' ' + git config push.default matching && echo "Simple text file" >textfile.c && echo "File with embedded NUL: Q <- there" | q_to_nul > binfile.bin && mkdir subdir && -- cgit v1.2.3 From c9704aa7aba9c31a6cb099bb9fa4b7cf8a79d680 Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Tue, 15 Jan 2013 21:05:06 -0500 Subject: t5550: do not assume the "matching" push is the default Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- t/t5550-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5550-http-fetch.sh b/t/t5550-http-fetch.sh index 80d20c876b..f7d0f146f0 100755 --- a/t/t5550-http-fetch.sh +++ b/t/t5550-http-fetch.sh @@ -13,6 +13,7 @@ LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5550'} start_httpd test_expect_success 'setup repository' ' + git config push.default matching && echo content1 >file && git add file && git commit -m one -- cgit v1.2.3 From bd7ac5990ca77b9a294ffb3bd0b6143b17bb35bd Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Tue, 15 Jan 2013 21:05:07 -0500 Subject: t5551: do not assume the "matching" push is the default Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- t/t5551-http-fetch.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c5cd2e348c..1b5508667f 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -13,6 +13,7 @@ LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5551'} start_httpd test_expect_success 'setup repository' ' + git config push.default matching && echo content >file && git add file && git commit -m one -- cgit v1.2.3 From ac47a22a7a3c01d38b39c6896a1965ac0b9c473d Mon Sep 17 00:00:00 2001 From: Brian Gernhardt Date: Tue, 15 Jan 2013 21:05:08 -0500 Subject: t5570: do not assume the "matching" push is the default Signed-off-by: Brian Gernhardt Signed-off-by: Junio C Hamano --- t/t5570-git-daemon.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh index a3a4e47e1d..f01edffa3c 100755 --- a/t/t5570-git-daemon.sh +++ b/t/t5570-git-daemon.sh @@ -8,6 +8,7 @@ LIB_GIT_DAEMON_PORT=${LIB_GIT_DAEMON_PORT-5570} start_git_daemon test_expect_success 'setup repository' ' + git config push.default matching && echo content >file && git add file && git commit -m one -- cgit v1.2.3