From: Constantine Plotnikov <constantine.plotnikov@gmail.com>
Date: Tue, 17 Aug 2010 14:48:59 GMT
Subject: Re: BUG: git log: fatal: internal error in diff-resolve-rename-copy
Message-ID: <AANLkTi=wWii8ep78G7OuyFQ+W9xsm6O-WVZBGyPJjg-p@mail.gmail.com>
In-Reply-To: <7vpqxmjphl.fsf@alter.siamese.dyndns.org>

On Fri, Aug 13, 2010 at 11:12 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Constantine Plotnikov <constantine.plotnikov@gmail.com> writes:
>>
>>> Somewhere between the git 1.7.0.2 and the git 1.7.2.0 the rename
>>> detection started to fail with fatal error on some files in our
>>> repository. The bug could be seen on the public IntelliJ IDEA
>>> repository (about 760M in size), but our users have reported it as
>>> well.
>> ...
>> But what 1da6175 (Make diffcore_std only can run once before a diff_flush,
>> 2010-05-06) did is clearly wrong.  Not wanting to call resolve-rename-copy
>> does not mean we do not want to run the rest of what diffcore_std() does
>> at all!  For example, "-S" and "--diff-filter=" options are processed in
>> that function; the exit status of the command based on the presense of
>> difference is computed in the function, too.
>
> This reverts 1da6175 (Make diffcore_std only can run once before a
> diff_flush, 2010-05-06) and replaces it with an uglier looking but
> hopefully correct fix.
>
> Constantine, does it fix your issue?
>
Yes. It fixes the issue on the known problematic files. The patch was
tested over 3235b7053 in the git.git master. Please apply it to the
next update.

Thank You,
Constantine