X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache-tree.c;h=3d8f218a5f9e838b15e1d56113a4dd56904ee544;hb=0959df45253de579598dfc431ba5e370acd0ab8e;hp=5f8ee87bb1c446341b640c2f978a658d6bfcfcd0;hpb=6e13921b4f7adcc7316a76c0c4955b85b1589a65;p=git.git

diff --git a/cache-tree.c b/cache-tree.c
index 5f8ee87bb..3d8f218a5 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -155,13 +155,17 @@ 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)) {
+		if (ce_stage(ce) || (ce->ce_flags & CE_INTENT_TO_ADD)) {
 			if (10 < ++funny) {
 				fprintf(stderr, "...\n");
 				break;
 			}
-			fprintf(stderr, "%s: unmerged (%s)\n",
-				ce->name, sha1_to_hex(ce->sha1));
+			if (ce_stage(ce))
+				fprintf(stderr, "%s: unmerged (%s)\n",
+					ce->name, sha1_to_hex(ce->sha1));
+			else
+				fprintf(stderr, "%s: not added yet\n",
+					ce->name);
 		}
 	}
 	if (funny)