Merge branch 'rs/unpack-trees-reduce-file-scope-global'
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:26 +0000 (15:15 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Sep 2016 22:15:26 +0000 (15:15 -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