Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

diffcore-break: micro-optimize by avoiding delta between identical fi…

…les.

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>
  • Loading branch information...
commit aeecd23ae2785a0462d42191974e9d9a8e439fbe 1 parent e3601e8
Junio C Hamano authored
Showing with 4 additions and 0 deletions.
  1. +4 −0 diffcore-break.c
View
4 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 */
Please sign in to comment.
Something went wrong with that request. Please try again.