diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-01-09 11:46:17 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-01-10 11:51:14 -0800 |
| commit | 30ac275b1c893697e25abefbd872de534bb8c046 (patch) | |
| tree | 04d503fcb89556619da2df4dbd261f7f1a1124c7 /git-rebase--merge.sh | |
| parent | Sync with maint-2.10 (diff) | |
| download | tgif-30ac275b1c893697e25abefbd872de534bb8c046.tar.xz | |
unpack-trees: move checkout state into check_updates
The checkout state was introduced via 16da134b1f9
(read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to
refactor the checkout state was done in b56aa5b268e (unpack-trees: pass
checkout state explicitly to check_updates(), 2016-09-13), but we can
go even further.
The `struct checkout state` is not used in unpack_trees apart from
initializing it, so move it into the function that makes use of it,
which is `check_updates`.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions