mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/fix-sparse-checkout'

Browse Source 
* nd/fix-sparse-checkout:
  unpack-trees: mark new entries skip-worktree appropriately
  unpack-trees: do not check for conflict entries too early
  unpack-trees: let read-tree -u remove index entries outside sparse area
  unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set
  t1011 (sparse checkout): style nitpicks
This commit is contained in:
Junio C Hamano
2010-08-21 23:28:05 -07:00
parent 2d984464c6 74da98f9c7
commit c3b9325fa6
3 changed files with 108 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -179,8 +179,7 @@ struct cache_entry {
#define CE_UNHASHED (0x200000)
#define CE_CONFLICTED (0x800000)
/* Only remove in work directory, not index */
#define CE_WT_REMOVE (0x400000)
#define CE_WT_REMOVE (0x400000) /* remove in work directory */
#define CE_UNPACKED (0x1000000)