From: Jeff King <peff@peff.net>
Date: Mon, 24 Feb 2014 20:39:47 GMT
Subject: Re: [PATCH] remote: handle pushremote config in any order order
Message-ID: <20140224203946.GB25506@sigill.intra.peff.net>
In-Reply-To: <xmqq7g8k8d5r.fsf@gitster.dls.corp.google.com>

On Mon, Feb 24, 2014 at 12:32:32PM -0800, Junio C Hamano wrote:

> >> +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?

No, you are not missing anything. I was copying and paring down the
pushremote test above, and I accidentally pared out the push.default
setting. It should definitely have a

  test_config push.default matching &&

before the "git push" line, as the test above does. Can you mark it up
as you apply?

-Peff