Merge branch 'rs/unpack-trees-reduce-file-scope-global' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:36 +0000 (16:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Sep 2016 23:49:36 +0000 (16:49 -0700)
Code cleanup.

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

1  2 
unpack-trees.c

diff --cc unpack-trees.c
Simple merge