Jeff King <peff@xxxxxxxx> writes:
> diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
> index 910c0d2..1293e3d 100644
> --- a/builtin-merge-recursive.c
> +++ b/builtin-merge-recursive.c
> @@ -361,7 +362,9 @@ static struct path_list *get_renames(struct tree *tree,
> diff_setup(&opts);
> DIFF_OPT_SET(&opts, RECURSIVE);
> opts.detect_rename = DIFF_DETECT_RENAME;
> - opts.rename_limit = rename_limit;
> + opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit :
> + diff_rename_limit >= 0 ? diff_rename_limit :
> + 100;
> opts.output_format = DIFF_FORMAT_NO_OUTPUT;
> if (diff_setup_done(&opts) < 0)
> die("diff setup failed");
Makes one wonder where the magic 100 comes from. Wouldn't this
opts.rename_limit = (merge_rename_limit >= 0)
? merge_rename_limit
: diff_rename_limit;
be easier to maintain, with the same semantics?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
