From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Jack Nagel <jacknagel@gmail•com>,
Ramkumar Ramachandra <artagnon@gmail•com>,
git@vger•kernel.org
Subject: Re: [PATCH] remote: handle pushremote config in any order order
Date: Mon, 24 Feb 2014 12:32:32 -0800 [thread overview]
Message-ID: <xmqq7g8k8d5r.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: xmqqvbw49z0f.fsf@gitster.dls.corp.google.com
Junio C Hamano <gitster@pobox•com> writes:
> 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.
>> 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?
next prev parent reply other threads:[~2014-02-24 20:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 5:10 [BUG] remote.pushdefault and branch.<name>.pushremote definition order Jack Nagel
2014-02-24 8:59 ` [PATCH] remote: handle pushremote config in any order order Jeff King
2014-02-24 17:55 ` Junio C Hamano
2014-02-24 20:32 ` Junio C Hamano [this message]
2014-02-24 20:39 ` Jeff King
2014-02-24 20:53 ` Junio C Hamano
2014-02-24 22:45 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7g8k8d5r.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=artagnon@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jacknagel@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox