diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-12-14 02:45:12 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-14 02:45:12 -0800 |
| commit | eab90210be73a7edc043a285340f8dc8973b9f07 (patch) | |
| tree | 69876750df9f46b0a7568a7a22c1295719e98ff8 | |
| parent | Update git-diff documentation (diff) | |
| parent | Bypass expensive content comparsion during rename detection. (diff) | |
| download | tgif-eab90210be73a7edc043a285340f8dc8973b9f07.tar.xz | |
Merge branch 'maint'
* maint:
Bypass expensive content comparsion during rename detection.
| -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 57a74b6bb8..91fa2bea51 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 && |