diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2006-12-14 05:07:46 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-14 02:40:33 -0800 |
| commit | 7da41f48c8acea834e8204917fe59da2b975903b (patch) | |
| tree | 4a07966ead29f783b0350a51c4c5c6338910f176 | |
| parent | 155bd0ce23144e5c7067965a22646523f1a38b51 (diff) | |
| download | git-7da41f48c8acea834e8204917fe59da2b975903b.tar.gz git-7da41f48c8acea834e8204917fe59da2b975903b.tar.xz | |
Bypass expensive content comparsion during rename detection.
When comparing file contents during the second loop through a rename
detection attempt we can skip the expensive byte-by-byte comparsion
if both source and destination files have valid SHA1 values. This
improves performance by avoiding either an expensive open/mmap to
read the working tree copy, or an expensive inflate of a blob object.
Unfortunately we still have to at least initialize the sizes of the
source and destination files even if the SHA1 values don't match.
Failing to initialize the sizes causes a number of test cases to fail
and start reporting different copy/rename behavior than was expected.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | diffcore-rename.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 57a74b6bb..91fa2bea5 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -109,6 +109,8 @@ static int is_exact_match(struct diff_filespec *src, return 0; if (src->size != dst->size) 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)) return 0; if (src->size == dst->size && |