From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 31 Oct 2013 18:50:53 GMT
Subject: Re: [PATCH] t: branch: improve test rollback
Message-ID: <xmqqsivh5l6a.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAMP44s01ABhU1tsqR+VKH6q6L+MNTDxHEgwfsCboxhP-euSmdA@mail.gmail.com>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> On Thu, Oct 31, 2013 at 12:32 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>
>>> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
>>> index 0fe7647..33673e0 100755
>>> --- a/t/t3200-branch.sh
>>> +++ b/t/t3200-branch.sh
>>> @@ -329,7 +329,7 @@ test_expect_success 'tracking setup fails on non-matching refspec' '
>>>  '
>>>
>>>  test_expect_success 'test tracking setup via config' '
>>> -     git config branch.autosetupmerge true &&
>>> +     test_config branch.autosetupmerge true &&
>>>       git config remote.local.url . &&
>>>       git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
>>
>> And "remote.local.*" setting does not follow that "pristine"
>> principle, making the result of applying this patch inconsistent.
>> Is that desirable?
>
> This patch is *improving* test rollback, it's not making it perfect.
>
> Let not the perfect be the enemy of the good.

The patch is making it worse by stopping in the middle.