diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-19 01:04:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-19 01:04:16 +0400 |
| commit | 4097a25429d09b61616845fbe6551587a30fa038 (patch) | |
| tree | 794750558aeafd79dcc29b230992d2d37a1d9d62 /t | |
| parent | 8aac6c97e81dee53ae7740663128b0296398d6d1 (diff) | |
| parent | 98b406f3ad6a6989a5b11c2a2582a9f539d66263 (diff) | |
Merge branch 'jk/remote-pushremote-config-reading' into maint
"git push" did not pay attention to branch.*.pushremote if it is
defined earlier than remote.pushdefault; the order of these two
variables in the configuration file should not matter, but it did by
mistake.
* jk/remote-pushremote-config-reading:
remote: handle pushremote config in any order
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5516-fetch-push.sh | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 926e7f6b97..67e0ab3462 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -536,6 +536,19 @@ test_expect_success 'push with config branch.*.pushremote' ' check_push_result down_repo $the_commit heads/master ' +test_expect_success 'branch.*.pushremote config order is irrelevant' ' + mk_test one_repo heads/master && + mk_test two_repo heads/master && + test_config remote.one.url one_repo && + test_config remote.two.url two_repo && + test_config branch.master.pushremote two_repo && + test_config remote.pushdefault one_repo && + test_config push.default matching && + git push && + check_push_result one_repo $the_first_commit heads/master && + check_push_result two_repo $the_commit heads/master +' + test_expect_success 'push with dry-run' ' mk_test testrepo heads/master && |