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)
commit633212b246c9af1698983fc53f06398be4dc2f70
treec6eb46bef53776327d365da691745f7f34d207ab
parentb0af4819938761654050d934c12c244c2de629be
parentb56aa5b268ee2188c3dee27cc94025f4c647594a
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()
unpack-trees.c