From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 01 Jun 2017 01:52:41 GMT
Subject: Re: [PATCH v2] pull: ff --rebase --autostash works in dirty repo
Message-ID: <xmqqbmq88oeu.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <0102015c5c7054ac-5ec72a28-ff81-42b8-8224-26a588cef485-000000@eu-west-1.amazonses.com>

Tyler Brazier <tyler@tylerbrazier.com> writes:

> When `git pull --rebase --autostash` in a dirty repository resulted in a
> fast-forward, nothing was being autostashed and the pull failed. This
> was due to a shortcut to avoid running rebase when we can fast-forward,
> but autostash is ignored on that codepath.
>
> Now we will only take the shortcut if autostash is not in effect.
> Based on a few tests against the git.git repo, the shortcut does not
> seem to give us significant performance benefits, on Linux at least.
> Regardless, it is more important to be correct than to be fast.
> ---

Missing sign-off.

Otherwise, nicely done.  Thanks.