From: Johan Herland <johan@herland.net>
Date: Mon, 24 Jun 2013 08:48:37 GMT
Subject: Re: [PATCH 3/6] push: change `simple` to accommodate triangular workflows
Message-ID: <CALKQrgda0h+FuxepbZfKjRob9kXwU=GPNCLT_OCSps_2ggAmbg@mail.gmail.com>
In-Reply-To: <7vppvcc51j.fsf@alter.siamese.dyndns.org>

On Mon, Jun 24, 2013 at 9:59 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Johan Herland <johan@herland.net> writes:
>>> An earlier round of this change by mistake broke the safety for
>>> "simple" mode we have had since day 1 of that mode to make sure that
>>> the branch in the repository we update is set to be the one we fetch
>>> and integrate with, but it has been fixed.
>>
>> Shouldn't there be an acompanying test to demonstrate this mistake being fixed?
>
> An operation that has to expect failure due to safety was disabled
> by the broken version.  The squashed end result reverts that change
> to the test, to make sure we did not break the safety.

Ok, thanks.

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net