X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-break.c;h=95b5eb492e3aa1a282347b875df04da31f276399;hb=a64dd34d8cce018742badb49b87c5c565be655ce;hp=c57513a4fa83c58c5040ead38c52765051cd13f5;hpb=a204756a45bd357280c156d01858138712493dfa;p=git.git

diff --git a/diffcore-break.c b/diffcore-break.c
index c57513a4..95b5eb49 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -58,6 +58,10 @@ static int should_break(struct diff_filespec *src,
 	if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
 		return 0; /* leave symlink rename alone */
 
+	if (src->sha1_valid && dst->sha1_valid &&
+	    !memcmp(src->sha1, dst->sha1, 20))
+		return 0; /* they are the same */
+
 	if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
 		return 0; /* error but caught downstream */