diff options
author | Martin Ågren <martin.agren@gmail.com> | 2018-05-20 12:17:34 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-21 06:56:15 +0900 |
commit | 89e653da5b1bee9cf645e9d4bdd95f6bb31cc4b9 (patch) | |
tree | 728bce3e5c70705267b669fd3e5ac2f365d6288a /compat/vcbuild/README | |
parent | merge: pass aggressive when rename detection is turned off (diff) | |
download | tgif-89e653da5b1bee9cf645e9d4bdd95f6bb31cc4b9.tar.xz |
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>
Diffstat (limited to 'compat/vcbuild/README')
0 files changed, 0 insertions, 0 deletions