X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=update-cache.c;h=68d2f95c1cfc90cc6d39bb4ec2f25f4ebd944d69;hb=00829b5def72f36269796727c9589316a214dc85;hp=7c3a143559d25f4231ab8225b49e5b0938de7baf;hpb=c747fc6facdbbde4386418cfe6ad7e231a1b4eaf;p=git.git

diff --git a/update-cache.c b/update-cache.c
index 7c3a1435..68d2f95c 100644
--- a/update-cache.c
+++ b/update-cache.c
@@ -196,9 +196,18 @@ static void refresh_cache(void)
 	int i;
 
 	for (i = 0; i < active_nr; i++) {
-		struct cache_entry *ce = active_cache[i];
-		struct cache_entry *new = refresh_entry(ce);
+		struct cache_entry *ce, *new;
+		ce = active_cache[i];
+		if (ce_stage(ce)) {
+			printf("%s: needs merge\n", ce->name);
+			while ((i < active_nr) &&
+			       ! strcmp(active_cache[i]->name, ce->name))
+				i++;
+			i--;
+			continue;
+		}
 
+		new = refresh_entry(ce);
 		if (!new) {
 			printf("%s: needs update\n", ce->name);
 			continue;