tree 728bce3e5c70705267b669fd3e5ac2f365d6288a
parent 6f10a09e0a1a7c3c3a6ee8e67390a4839dbe6a1b
author Martin Ågren <martin.agren@gmail.com> 1526811454 +0200
committer Junio C Hamano <gitster@pobox.com> 1526853375 +0900

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>