diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
| commit | 816c02ce8ecddce065e83db9f4ecb78f6b0e23dc (patch) | |
| tree | b85fa8225e982f67dd4e9d516b92c3f03a1f99bc /diffcore-rename.c | |
| parent | 1d3d03bbeaaf55844868affc96231930aae792e6 (diff) | |
| parent | 7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (diff) | |
| download | git-816c02ce8ecddce065e83db9f4ecb78f6b0e23dc.tar.gz | |
Merge fixes early for next maint series.
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 39d9126cb9..ffd126af0d 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -176,8 +176,10 @@ static int estimate_similarity(struct diff_filespec *src, /* A delta that has a lot of literal additions would have * big delta_size no matter what else it does. */ - if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) + if (base_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE) { + free(delta); return 0; + } /* Estimate the edit size by interpreting delta. */ if (count_delta(delta, delta_size, &src_copied, &literal_added)) { |