diff options
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index 06f9a7f..c57513a 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -62,10 +62,14 @@ static int should_break(struct diff_filespec *src, return 0; /* error but caught downstream */ base_size = ((src->size < dst->size) ? src->size : dst->size); + if (base_size < MINIMUM_BREAK_SIZE) + return 0; /* we do not break too small filepair */ delta = diff_delta(src->data, src->size, dst->data, dst->size, &delta_size, 0); + if (!delta) + return 0; /* error but caught downstream */ /* Estimate the edit size by interpreting delta. */ if (count_delta(delta, delta_size, @@ -168,8 +172,7 @@ void diffcore_break(int break_score) !S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) && !strcmp(p->one->path, p->two->path)) { if (should_break(p->one, p->two, - break_score, &score) && - MINIMUM_BREAK_SIZE <= p->one->size) { + break_score, &score)) { /* Split this into delete and create */ struct diff_filespec *null_one, *null_two; struct diff_filepair *dp; |