Merge branch 'as/sparse-checkout-removal' into maint
commit4f66e44300fd7e718d7240e211f2d4a3c576de82
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:27 +0000 (19 14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:27 +0000 (19 14:41 -0700)
tree170c744122082f14ebfc7854f6b53ee054bff89a
parent7e7ce32f7aa3b2b63d267c7efa173d129d1096cb
parent7d782416cb5176d93a073bee8048163db544c80f
Merge branch 'as/sparse-checkout-removal' into maint

"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