diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-31 12:00:02 -0700 |
| commit | b3c89315a33fbded4a8c5d533ca8ddc6087e4c23 (patch) | |
| tree | 804bd0c440bcbd6c365460e5d60163b44cd8c200 /merge-recursive.c | |
| parent | e596fd295fbb6e7453cd541554ba27ab185f870d (diff) | |
| parent | f31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff) | |
| download | git-b3c89315a33fbded4a8c5d533ca8ddc6087e4c23.tar.gz | |
Merge branch 'jc/rename-degrade-cc-to-c' into maint
* jc/rename-degrade-cc-to-c:
diffcore-rename: fall back to -C when -C -C busts the rename limit
diffcore-rename: record filepair for rename src
diffcore-rename: refactor "too many candidates" logic
builtin/diff.c: remove duplicated call to diff_result_code()
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index dba27643bd..ae6ade4ecb 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -22,11 +22,6 @@ #include "dir.h" #include "submodule.h" -static const char rename_limit_advice[] = -"inexact rename detection was skipped because there were too many\n" -" files. You may want to set your merge.renamelimit variable to at least\n" -" %d and retry this merge."; - static struct tree *shift_tree_object(struct tree *one, struct tree *two, const char *subtree_shift) { @@ -1652,8 +1647,9 @@ int merge_recursive(struct merge_options *o, commit_list_insert(h2, &(*result)->parents->next); } flush_output(o); - if (o->needed_rename_limit) - warning(rename_limit_advice, o->needed_rename_limit); + if (show(o, 2)) + diff_warn_rename_limit("merge.renamelimit", + o->needed_rename_limit, 0); return clean; } |