Commit 95367366b2bed4d399cf91faf13b234273d861a8

Edward Thomson 2017-02-09T16:57:22

merge: don't do rename detection on submodules

1
2
3
4
5
6
7
8
9
10
11
12
13
diff --git a/src/merge.c b/src/merge.c
index 087178a..eceadf0 100644
--- a/src/merge.c
+++ b/src/merge.c
@@ -1075,7 +1075,7 @@ static int index_entry_similarity_inexact(
 	int score = 0;
 	int error = 0;
 
-	if (GIT_MODE_TYPE(a->mode) != GIT_MODE_TYPE(b->mode))
+	if (!GIT_MODE_ISBLOB(a->mode) || !GIT_MODE_ISBLOB(b->mode))
 		return 0;
 
 	/* update signature cache if needed */