From 95367366b2bed4d399cf91faf13b234273d861a8 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@github.com>
Date: Thu, 9 Feb 2017 16:57:22 +0000
Subject: [PATCH] merge: don't do rename detection on submodules

---
 src/merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/merge.c b/src/merge.c
index 087178ace..eceadf08a 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 */