summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-04-30 17:24:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-03 20:39:53 (GMT)
commit50705915eae89eae490dff30fa370ed02e4d6e72 (patch)
treeb4a1ce7f2fac328e9d54e589461bd4468508ce9a /diff.c
parent2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (diff)
downloadgit-50705915eae89eae490dff30fa370ed02e4d6e72.zip
git-50705915eae89eae490dff30fa370ed02e4d6e72.tar.gz
git-50705915eae89eae490dff30fa370ed02e4d6e72.tar.bz2
bump rename limit defaults
The current rename limit default of 100 was arbitrarily chosen. Testing[1] has shown that on modern hardware, a limit of 200 adds about a second of computation time, and a limit of 500 adds about 5 seconds of computation time. This patch bumps the default limit to 200 for viewing diffs, and to 500 for performing a merge. The limit for generating git-status templates is set independently; we bump it up to 200 here, as well, to match the diff limit. [1]: See <20080211113516.GB6344@coredump.intra.peff.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 3632b55..f735519 100644
--- a/diff.c
+++ b/diff.c
@@ -19,7 +19,7 @@
#endif
static int diff_detect_rename_default;
-static int diff_rename_limit_default = 100;
+static int diff_rename_limit_default = 200;
int diff_use_color_default = -1;
static const char *external_diff_cmd_cfg;
int diff_auto_refresh_index = 1;