diff: make "too many files" rename warning optional
authorJeff King <peff@peff.net>
Wed, 30 Apr 2008 17:25:53 +0000 (13:25 -0400)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 May 2008 20:40:43 +0000 (13:40 -0700)
commitb8960bbe7bdfc0b232462f916ee8151c83afd16f
treef6f72c3264d87e75eb8c07c0c5bb9e44c1780c06
parent50705915eae89eae490dff30fa370ed02e4d6e72
diff: make "too many files" rename warning optional

In many cases, the warning ends up as clutter, because the
diff is being done "behind the scenes" from the user (e.g.,
when generating a commit diffstat), and whether we show
renames or not is not particularly interesting to the user.

However, in the case of a merge (which is what motivated the
warning in the first place), it is a useful hint as to why a
merge with renames might have failed.

This patch makes the warning optional based on the code
calling into diffcore. We default to not showing the
warning, but turn it on for merges.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-merge-recursive.c
diff.h
diffcore-rename.c