From: Martin Ågren <martin.agren@gmail.com>
Date: Tue, 24 Apr 2018 09:36:34 GMT
Subject: Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`
Message-ID: <CAN0heSqo43YkHa-1e7jaZqxktenonj3HZFrF=AKYR4+3ciZ2Sg@mail.gmail.com>
In-Reply-To: <CA+P7+xqP8b1i4-C242de2_P9dFsZ03pcRGo45scyfK2ohd-ykw@mail.gmail.com>

On 24 April 2018 at 08:20, Jacob Keller <jacob.keller@gmail.com> wrote:
> I'm guessing the diff algorithm simply found that this was a more
> compact representation of the change? It's a bit confusing when your
> description indicates you "moved" some code down, but it looks like
> you moved code up.

Agreed. I'll play with --anchored and other magic stuff to see if I can
improve this. Or I could instead try to sell this patch as "move some
other stuff out of the way" ;-) That seems a bit less direct though.

Thanks
Martin