From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 03 May 2008 20:15:06 GMT
Subject: Re: [PATCH 1/3] add merge.renamelimit config option
Message-ID: <7viqxvta9h.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080430172354.GA23747@sigill.intra.peff.net>

Jeff King <peff@peff.net> 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?