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)
commit8348bf1b6957e8e75fbfc988ce4e7802ce408d6b
treeb3612e68729263e59beb9276374a3ad23225b915
parentd939af12bd96db7ad3e671a0585ad8570aa7e9d3
parent7d782416cb5176d93a073bee8048163db544c80f
Merge branch 'as/sparse-checkout-removal'

"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
unpack-trees.c