Re: [PATCH] remote: handle pushremote config in any order order
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 24, 2014, 20:32 UTC
- Message-ID
- <xmqq7g8k8d5r.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <xmqqvbw49z0f.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 6 quoted lines
> Jeff King <peff@peff.net> writes: > >> Yes, with a few exceptions, we usually try to make the ordering in the >> config file irrelevant. This is a bug. The patch below should fix it. > > Looks good. Thanks.
Show 20 quoted lines
>> diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh >> index 926e7f6..1309c4d 100755 >> --- a/t/t5516-fetch-push.sh >> +++ b/t/t5516-fetch-push.sh >> @@ -536,6 +536,18 @@ 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 && >> + git push && >> + check_push_result one_repo $the_first_commit heads/master && >> + check_push_result two_repo $the_commit heads/master >> +' >> +
This test however does not pass in the Git 2.0 world, without having this line:
test_config push.default matching &&
immediately before "git push".
Am I missing something?