From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 21 Feb 2011 23:33:14 GMT
Subject: Re: [PATCH 1/4] merge: improve inexact rename limit warning
Message-ID: <7vzkppgdz9.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20110219102051.GA22508@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> 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>

Thanks.

This conflicts with 2840824 (diffcore-rename: fall back to -C when -C -C
busts the rename limit, 2011-01-06) on 'pu', unfortunately.