Merge branch 'as/sparse-checkout-removal'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:28 +0000 (11:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Aug 2015 18:01:28 +0000 (11:01 -0700)
"sparse checkout" misbehaved for a path that is excluded from the
checkout when switching between branches that differ at the path.

* as/sparse-checkout-removal:
  unpack-trees: don't update files with CE_WT_REMOVE set

1  2 
unpack-trees.c

diff --cc unpack-trees.c
Simple merge