Merge branch 'maint'

* maint: Bypass expensive content comparsion during rename detection.
git-mirror · Dec 14, 2006 · eab9021 · eab9021
2 parents f5e6b89 + 7da41f4
commit eab9021
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/diffcore-rename.c b/diffcore-rename.c
@@ -109,6 +109,8 @@ static int is_exact_match(struct diff_filespec *src,
 		return 0;
 	if (src->size != dst->size)
 		return 0;
+	if (src->sha1_valid && dst->sha1_valid)
+	    return !hashcmp(src->sha1, dst->sha1);
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0;
 	if (src->size == dst->size &&