diff options
| author | Jeff King <peff@peff.net> | 2008-04-30 13:24:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-03 13:39:53 -0700 |
| commit | 50705915eae89eae490dff30fa370ed02e4d6e72 (patch) | |
| tree | b4a1ce7f2fac328e9d54e589461bd4468508ce9a /builtin-merge-recursive.c | |
| parent | 2a2ac926547bc4fa91fcd1cb741dd5691ba9b974 (diff) | |
| download | git-50705915eae89eae490dff30fa370ed02e4d6e72.tar.gz git-50705915eae89eae490dff30fa370ed02e4d6e72.tar.xz | |
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 'builtin-merge-recursive.c')
| -rw-r--r-- | builtin-merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c index 1293e3d34..3902e9106 100644 --- a/builtin-merge-recursive.c +++ b/builtin-merge-recursive.c @@ -364,7 +364,7 @@ static struct path_list *get_renames(struct tree *tree, opts.detect_rename = DIFF_DETECT_RENAME; opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit : diff_rename_limit >= 0 ? diff_rename_limit : - 100; + 500; opts.output_format = DIFF_FORMAT_NO_OUTPUT; if (diff_setup_done(&opts) < 0) die("diff setup failed"); |