Re: `pull --rebase --autostash` fails when fast forward in dirty repo

From: Tyler Brazier <tylerbrazier@gmail.com>
Date: May 26, 2017, 04:38 UTC
Message-ID: <CAAZatrCQZq5_Jc=O-6guyKx1BcOcTNOmWoqwGNrbotnK-VXacg@mail.gmail.com>
In-Reply-To: <xmqqpoewcy05.fsf@gitster.mtv.corp.google.com>

Does git accept outside pull requests? I wouldn't mind committing the fix for this once it's been decided what the fix should be. (It might help my resume ;)

On Thu, May 25, 2017 at 6:33 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 13 quoted lines

> Jeff King <peff@peff.net> writes:
>
>> Anyway. All this has shown me is that it's probably pointless to do this
>> timing at all on Linux. Somebody on Windows might get better results.
>>
>> But regardless, we need to do something. Correctness must trump
>> optimizations, and the question is whether we can throw out the whole
>> conditional, or if we should just restrict when it kicks in.
>
> Yes.  I personally do not mind going with the simplest approach.
> The optimization thing is relatively new and we were perfectly happy
> without it before ;-).
>