]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e7ce32 7d78241)
Merge branch 'as/sparse-checkout-removal' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:27 +0000 (14:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Aug 2015 21:41:27 +0000 (14:41 -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 patch | diff1 | diff2 | blob | history

diff --cc unpack-trees.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.