From: Martin Ågren <martin.agren@gmail.com>
Date: Sun, 20 May 2018 10:17:34 +0000 (+0200)
Subject: merge: setup `opts` later in `checkout_fast_forward()`
X-Git-Tag: v2.18.0-rc0~2^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/89e653da5b1bee9cf645e9d4bdd95f6bb31cc4b9?ds=inline;hp=89e653da5b1bee9cf645e9d4bdd95f6bb31cc4b9

merge: setup `opts` later in `checkout_fast_forward()`

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 later commit fix a
memory leak without having to worry about those early returns.

This patch is best viewed using something like this (note the tab!):
--color-moved --anchored="	trees[nr_trees] = parse_tree_indirect"

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---