X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-break.c;h=b0c8461e1243328795258f0fd7d12f509403403c;hb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;hp=9852f9716cb1a52842044e557c175b19118f19fb;hpb=85c1f337be49eaa9a22e42a1c9958deef5ab57c3;p=git.git diff --git a/diffcore-break.c b/diffcore-break.c index 9852f971..b0c8461e 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -65,7 +65,7 @@ static int should_break(struct diff_filespec *src, delta = diff_delta(src->data, src->size, dst->data, dst->size, - &delta_size, ~0UL); + &delta_size, 0); /* Estimate the edit size by interpreting delta. */ if (count_delta(delta, delta_size, @@ -231,8 +231,8 @@ static void merge_broken(struct diff_filepair *p, dp = diff_queue(outq, d->one, c->two); dp->score = p->score; - diff_free_filespec_data(d->two); - diff_free_filespec_data(c->one); + diff_free_filespec(d->two); + diff_free_filespec(c->one); free(d); free(c); }