diffcore-break: micro-optimize by avoiding delta between identical files.
We did not check if we have the same file on both sides when computing break score. This is usually not a problem, but if the user said --find-copies-harde with -B, we ended up trying a delta between the same data even when we know the SHA1 hash of both sides match. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Feb 28, 2006 at 20:19 UTC
aeecd23ae2785a0462d42191974e9d9a8e439fbe
1 file changed
+4
diffcore-break.c
+4
@@ -58,6 +58,10 @@ static int should_break(struct diff_filespec *src,
58
if (!S_ISREG(src->mode) || !S_ISREG(dst->mode))
59
return 0; /* leave symlink rename alone */
60
61
+ if (src->sha1_valid && dst->sha1_valid &&
62
+ !memcmp(src->sha1, dst->sha1, 20))
63
+ return 0; /* they are the same */
64
+
65
if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
66
return 0; /* error but caught downstream */
67