Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint

Code cleanup. * rs/unpack-trees-reduce-file-scope-global: unpack-trees: pass checkout state explicitly to check_updates()