diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-14 12:37:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-14 12:37:28 -0700 |
| commit | adf59ec127f447aa83c84f9dbe2ae4e6417f3760 (patch) | |
| tree | 6f18778312b98ea48205c127c1a07e967dc4c77b /diffcore-rename.c | |
| parent | 0bdf93cbf0afd568384f237378ba368e751a2f0f (diff) | |
| parent | b8960bbe7bdfc0b232462f916ee8151c83afd16f (diff) | |
| download | git-adf59ec127f447aa83c84f9dbe2ae4e6417f3760.tar.xz | |
Merge branch 'jk/renamelimit' (early part)
* 'jk/renamelimit' (early part):
diff: make "too many files" rename warning optional
bump rename limit defaults
add merge.renamelimit config option
Diffstat (limited to 'diffcore-rename.c')
| -rw-r--r-- | diffcore-rename.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c index 1369a5ec45..1b2ebb4001 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -492,7 +492,8 @@ void diffcore_rename(struct diff_options *options) rename_limit = 32767; if ((num_create > rename_limit && num_src > rename_limit) || (num_create * num_src > rename_limit * rename_limit)) { - warning("too many files, skipping inexact rename detection"); + if (options->warn_on_too_large_rename) + warning("too many files, skipping inexact rename detection"); goto cleanup; } |