Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t3404: use configured shell instead of /bin/sh
[gitweb.git]
/
builtin-read-tree.c
diff --git
a/builtin-read-tree.c
b/builtin-read-tree.c
index c0ea0342b755c6749391803d19f852182c0c512e..57854017535a36fc1fcd7bb997f198956391199d 100644
(file)
--- a/
builtin-read-tree.c
+++ b/
builtin-read-tree.c
@@
-45,8
+45,7
@@
static int read_cache_unmerged(void)
continue;
cache_tree_invalidate_path(active_cache_tree, ce->name);
last = ce;
- ce->ce_mode = 0;
- ce->ce_flags &= ~htons(CE_STAGEMASK);
+ ce->ce_flags |= CE_REMOVE;
}
*dst++ = ce;
}