X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore-rename.c;h=dba965c0b4006251b1da04465d319c5fe9997ea4;hb=3dd94e3b2e2f5b00512273f96ab5628c742c112c;hp=e17dd90058443ea75321f8c48818bd0094bd76a3;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git diff --git a/diffcore-rename.c b/diffcore-rename.c index e17dd900..dba965c0 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -283,7 +283,7 @@ void diffcore_rename(struct diff_options *options) register_rename_src(p->one, 1); } if (rename_dst_nr == 0 || - (0 <= rename_limit && rename_limit < rename_dst_nr)) + (0 < rename_limit && rename_limit < rename_dst_nr)) goto cleanup; /* nothing to do */ /* We really want to cull the candidates list early @@ -307,6 +307,9 @@ void diffcore_rename(struct diff_options *options) if (rename_count == rename_dst_nr) goto cleanup; + if (minimum_score == MAX_SCORE) + goto cleanup; + num_create = (rename_dst_nr - rename_count); num_src = rename_src_nr; mx = xmalloc(sizeof(*mx) * num_create * num_src);