From 191474a1f423aaea6f0b9dacf68216b3ba8e34d4 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 9 Feb 2017 18:28:19 +0000 Subject: diff: don't do rename detection on submodules --- src/diff_tform.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diff_tform.c b/src/diff_tform.c index f2ff147d1..b004ddd66 100644 --- a/src/diff_tform.c +++ b/src/diff_tform.c @@ -553,8 +553,8 @@ static int similarity_measure( *score = -1; - /* don't try to compare files of different types */ - if (GIT_MODE_TYPE(a_file->mode) != GIT_MODE_TYPE(b_file->mode)) + /* don't try to compare things that aren't files */ + if (!GIT_MODE_ISBLOB(a_file->mode) || !GIT_MODE_ISBLOB(b_file->mode)) return 0; /* if exact match is requested, force calculation of missing OIDs now */ -- cgit v1.2.1