X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-rerere.c;h=58c5fed91d9d8f2f0fd573f5621344f795f1c11c;hb=7943b3a94f0f862dc9d7dcec6b5639ae5bf027bd;hp=318d959d89669f09e12b1b97ca62f100e1a58ecd;hpb=38ebbacd93eb547b3608b64a2efc60fd79e1ea85;p=git.git

diff --git a/builtin-rerere.c b/builtin-rerere.c
index 318d959d8..58c5fed91 100644
--- a/builtin-rerere.c
+++ b/builtin-rerere.c
@@ -154,13 +154,17 @@ static int find_conflict(struct path_list *conflict)
 		return error("Could not read index");
 	for (i = 0; i + 2 < active_nr; i++) {
 		struct cache_entry *e1 = active_cache[i];
-		struct cache_entry *e2 = active_cache[i + 1];
-		struct cache_entry *e3 = active_cache[i + 2];
-		if (ce_stage(e1) == 1 && ce_stage(e2) == 2 &&
-				ce_stage(e3) == 3 && ce_same_name(e1, e2) &&
-				ce_same_name(e1, e3)) {
+		struct cache_entry *e2 = active_cache[i+1];
+		struct cache_entry *e3 = active_cache[i+2];
+		if (ce_stage(e1) == 1 &&
+		    ce_stage(e2) == 2 &&
+		    ce_stage(e3) == 3 &&
+		    ce_same_name(e1, e2) && ce_same_name(e1, e3) &&
+		    S_ISREG(ntohl(e1->ce_mode)) &&
+		    S_ISREG(ntohl(e2->ce_mode)) &&
+		    S_ISREG(ntohl(e3->ce_mode))) {
 			path_list_insert((const char *)e1->name, conflict);
-			i += 3;
+			i += 2;
 		}
 	}
 	return 0;