From: Jeff King Date: Sat, 19 Feb 2011 10:21:28 +0000 (-0500) Subject: bump rename limit defaults (again) X-Git-Tag: v1.7.5-rc0~60^2~4 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=92c57e5c1d29db96a927e2a713c5aa4ae99ce749;p=git.git bump rename limit defaults (again) We did this once before in 5070591 (bump rename limit defaults, 2008-04-30). Back then, we were shooting for about 1 second for a diff/log calculation, and 5 seconds for a merge. There are a few new things to consider, though: 1. Average processors are faster now. 2. We've seen on the mailing list some ugly merges where not using inexact rename detection leads to many more conflicts. Merges of this size take a long time anyway, so users are probably happy to spend a little bit of time computing the renames. Let's bump the diff/merge default limits from 200/500 to 400/1000. Those are 2 seconds and 10 seconds respectively on my modern hardware. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/diff.c b/diff.c index 5422c4388..869cca753 100644 --- a/diff.c +++ b/diff.c @@ -23,7 +23,7 @@ #endif static int diff_detect_rename_default; -static int diff_rename_limit_default = 200; +static int diff_rename_limit_default = 400; static int diff_suppress_blank_empty; int diff_use_color_default = -1; static const char *diff_word_regex_cfg; diff --git a/merge-recursive.c b/merge-recursive.c index 2ecd456c2..089aa10cc 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -439,7 +439,7 @@ static struct string_list *get_renames(struct merge_options *o, opts.detect_rename = DIFF_DETECT_RENAME; opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : o->diff_rename_limit >= 0 ? o->diff_rename_limit : - 500; + 1000; opts.rename_score = o->rename_score; opts.output_format = DIFF_FORMAT_NO_OUTPUT; if (diff_setup_done(&opts) < 0)