| commit | bf0ab10fa84df6c49450a06077d1c52756d88222 | |
| author | Jeff King <peff@peff.net> | |
| Sat, 19 Feb 2011 10:20:51 +0000 (19 05:20 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 21 Feb 2011 18:21:26 +0000 (21 10:21 -0800) | ||
| tree | 0722540155c202e474b59de2fa41db1e740a4bbd | treesnapshot (tar.gz zip) |
| parent | 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 | commitdiff |
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>
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>
| diff.h | diffblobblamehistory | |
| diffcore-rename.c | diffblobblamehistory | |
| merge-recursive.c | diffblobblamehistory | |
| merge-recursive.h | diffblobblamehistory |