From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:28 +0000 (-0700)
Subject: Merge branch 'as/sparse-checkout-removal'
X-Git-Tag: v2.6.0-rc0~89
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8348bf1b6957e8e75fbfc988ce4e7802ce408d6b;p=git-core%2Fgit.git

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
---

8348bf1b6957e8e75fbfc988ce4e7802ce408d6b