From b8960bbe7bdfc0b232462f916ee8151c83afd16f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 30 Apr 2008 13:25:53 -0400 Subject: diff: make "too many files" rename warning optional In many cases, the warning ends up as clutter, because the diff is being done "behind the scenes" from the user (e.g., when generating a commit diffstat), and whether we show renames or not is not particularly interesting to the user. However, in the case of a merge (which is what motivated the warning in the first place), it is a useful hint as to why a merge with renames might have failed. This patch makes the warning optional based on the code calling into diffcore. We default to not showing the warning, but turn it on for merges. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin-merge-recursive.c | 1 + 1 file changed, 1 insertion(+) (limited to 'builtin-merge-recursive.c') diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 3902e9106..46e636fdc 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -365,6 +365,7 @@ static struct path_list *get_renames(struct tree *tree, opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit : diff_rename_limit >= 0 ? diff_rename_limit : 500; + opts.warn_on_too_large_rename = 1; opts.output_format = DIFF_FORMAT_NO_OUTPUT; if (diff_setup_done(&opts) < 0) die("diff setup failed"); -- cgit v1.2.1