kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  Bypass expensive content comparsion during rename detection.
maint
Junio C Hamano 2006-12-14 02:45:12 -08:00
parent f5e6b89b3a 7da41f48c8
commit eab90210be
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diffcore-rename.c
View File

@ -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 &&