merge: don't do rename detection on submodules

95367366 · Edward Thomson · 49806e9b · 95367366
Commit 95367366 authored Feb 09, 2017 by Edward Thomson
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

src/merge.c
+1 -1

No files found.
--- 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 */