summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-02-19 10:20:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-21 18:21:26 (GMT)
commitbf0ab10fa84df6c49450a06077d1c52756d88222 (patch)
tree0722540155c202e474b59de2fa41db1e740a4bbd /diff.h
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (diff)
downloadgit-bf0ab10fa84df6c49450a06077d1c52756d88222.zip
git-bf0ab10fa84df6c49450a06077d1c52756d88222.tar.gz
git-bf0ab10fa84df6c49450a06077d1c52756d88222.tar.bz2
merge: improve inexact rename limit warning
The warning is generated deep in the diffcore code, which means that it will come first, followed possibly by a spew of conflicts, making it hard to see. Instead, let's have diffcore pass back the information about how big the rename limit would needed to have been, and then the caller can provide a more appropriate message (and at a more appropriate time). No refactoring of other non-merge callers is necessary, because nobody else was even using the warn_on_rename_limit feature. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 0083d92..f774c9a 100644
--- a/diff.h
+++ b/diff.h
@@ -110,7 +110,7 @@ struct diff_options {
int pickaxe_opts;
int rename_score;
int rename_limit;
- int warn_on_too_large_rename;
+ int needed_rename_limit;
int dirstat_percent;
int setup;
int abbrev;