Browse Source

Merge branch 'maint'

* maint:
  Bypass expensive content comparsion during rename detection.
maint
Junio C Hamano 18 years ago
parent
commit
eab90210be
  1. 2
      diffcore-rename.c

2
diffcore-rename.c

@ -109,6 +109,8 @@ static int is_exact_match(struct diff_filespec *src,
return 0; return 0;
if (src->size != dst->size) if (src->size != dst->size)
return 0; 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)) if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
return 0; return 0;
if (src->size == dst->size && if (src->size == dst->size &&

Loading…
Cancel
Save