Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`

2018-04-24 Thread Johannes Schindelin
Hi Martin, On Tue, 24 Apr 2018, Martin Ågren wrote: > On 24 April 2018 at 08:20, Jacob Keller 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

Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`

2018-04-24 Thread Martin Ågren
On 24 April 2018 at 08:20, Jacob Keller 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 wi

Re: [PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`

2018-04-23 Thread Jacob Keller
On Mon, Apr 23, 2018 at 10:13 PM, Martin Ågren wrote: > After we initialize the various fields in `opts` but before we actually > use them, we might return early. Move the initialization further down, > to immediately before we use `opts`. > > This limits the scope of `opts` and will help a subseq

[PATCH 1/2] merge: setup `opts` later in `checkout_fast_forward()`

2018-04-23 Thread Martin Ågren
After we initialize the various fields in `opts` but before we actually use them, we might return early. Move the initialization further down, to immediately before we use `opts`. This limits the scope of `opts` and will help a subsequent commit fix a memory leak without having to worry about thos