aboutsummaryrefslogtreecommitdiff
path: root/ppc
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-02-19 05:20:51 -0500
committerJunio C Hamano <gitster@pobox.com>2011-02-21 10:21:26 -0800
commitbf0ab10fa84df6c49450a06077d1c52756d88222 (patch)
tree0722540155c202e474b59de2fa41db1e740a4bbd /ppc
parent7ed863a85a6ce2c4ac4476848310b8f917ab41f9 (diff)
downloadgit-bf0ab10fa84df6c49450a06077d1c52756d88222.tar.gz
git-bf0ab10fa84df6c49450a06077d1c52756d88222.tar.xz
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 'ppc')
0 files changed, 0 insertions, 0 deletions