X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache-tree.c;h=bf03cb7fcefdc7e119203f096b367592d5b7cf8c;hb=471dcfdbb23ad423168d928335bc36217f9e311d;hp=8de39590d57e14d08ee4d04b74965191aa905b29;hpb=b052781fef2f978ba9cc55d6de942bb779bd54ac;p=git.git

diff --git a/cache-tree.c b/cache-tree.c
index 8de39590d..bf03cb7fc 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -158,7 +158,7 @@ static int verify_cache(struct cache_entry **cache,
 	funny = 0;
 	for (i = 0; i < entries; i++) {
 		struct cache_entry *ce = cache[i];
-		if (ce_stage(ce) || (ce->ce_flags & CE_INTENT_TO_ADD)) {
+		if (ce_stage(ce)) {
 			if (silent)
 				return -1;
 			if (10 < ++funny) {
@@ -338,8 +338,8 @@ static int update_one(struct cache_tree *it,
 				mode, sha1_to_hex(sha1), entlen+baselen, path);
 		}
 
-		if (ce->ce_flags & CE_REMOVE)
-			continue; /* entry being removed */
+		if (ce->ce_flags & (CE_REMOVE | CE_INTENT_TO_ADD))
+			continue; /* entry being removed or placeholder */
 
 		strbuf_grow(&buffer, entlen + 100);
 		strbuf_addf(&buffer, "%o %.*s%c", mode, entlen, path + baselen, '\0');