diff --git a/diffcore-break.c b/diffcore-break.c
index 920062bfd9047b4577485f8c8a152f20a2b8f297..c57513a4fa83c58c5040ead38c52765051cd13f5 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
return 0; /* error but caught downstream */
base_size = ((src->size < dst->size) ? src->size : dst->size);
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 = diff_delta(src->data, src->size,
dst->data, dst->size,
- &delta_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,
/* Estimate the edit size by interpreting delta. */
if (count_delta(delta, delta_size,
!S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) &&
!strcmp(p->one->path, p->two->path)) {
if (should_break(p->one, p->two,
!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;
/* Split this into delete and create */
struct diff_filespec *null_one, *null_two;
struct diff_filepair *dp;