undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees(): add CE_WT_REMOVE to remove on worktree alone

Browse Source 
CE_REMOVE now removes both worktree and index versions. Sparse
checkout must be able to remove worktree version while keep the
index intact when checkout area is narrowed.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2009-08-20 20:47:06 +07:00 committed by Junio C Hamano
parent ed5336a754
commit e663db2f44
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cache.h
View File

@ -177,6 +177,9 @@ struct cache_entry {
#define CE_HASHED (0x100000) #define CE_HASHED (0x100000)
#define CE_UNHASHED (0x200000) #define CE_UNHASHED (0x200000)
/* Only remove in work directory, not index */
#define CE_WT_REMOVE (0x400000)
/* /*
* Extended on-disk flags * Extended on-disk flags
*/ */

9
unpack-trees.c
View File

@ -78,7 +78,7 @@ static int check_updates(struct unpack_trees_options *o)
if (o->update && o->verbose_update) { if (o->update && o->verbose_update) {
for (total = cnt = 0; cnt < index->cache_nr; cnt++) { for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
struct cache_entry *ce = index->cache[cnt]; struct cache_entry *ce = index->cache[cnt];
if (ce->ce_flags & (CE_UPDATE | CE_REMOVE)) if (ce->ce_flags & (CE_UPDATE | CE_REMOVE | CE_WT_REMOVE))
total++; total++;
} }
@ -92,6 +92,13 @@ static int check_updates(struct unpack_trees_options *o)
for (i = 0; i < index->cache_nr; i++) { for (i = 0; i < index->cache_nr; i++) {
struct cache_entry *ce = index->cache[i]; struct cache_entry *ce = index->cache[i];
if (ce->ce_flags & CE_WT_REMOVE) {
display_progress(progress, ++cnt);
if (o->update)
unlink_entry(ce);
continue;
}
if (ce->ce_flags & CE_REMOVE) { if (ce->ce_flags & CE_REMOVE) {
display_progress(progress, ++cnt); display_progress(progress, ++cnt);
if (o->update) if (o->update)