git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: BUG: git log: fatal: internal error in diff-resolve-rename-copy

From
CPConstantine Plotnikov <constantine.plotnikov@gmail.com>
Date
Aug 17, 2010, 14:48 UTC
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:
Show 23 quoted lines
> 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

Previous: Ævar Arnfjörð Bjarmason
Message 16 of 16 in “BUG: git log: fatal: internal error in diff-resolve-rename-copy”
  1. Constantine PlotnikovAug 13, 2010
  2. Ævar Arnfjörð BjarmasonAug 13, 2010
  3. Junio C HamanoAug 13, 2010
  4. Linus TorvaldsAug 13, 2010
  5. Junio C HamanoAug 13, 2010
  6. diff --follow: do call diffcore_std() as necessaryJunio C Hamano, Aug 13, 2010
  7. Ævar Arnfjörð BjarmasonAug 13, 2010
  8. Junio C HamanoAug 13, 2010
  9. log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason, Aug 14, 2010
  10. Ævar Arnfjörð BjarmasonAug 14, 2010
  11. Junio C HamanoAug 15, 2010
  12. Ævar Arnfjörð BjarmasonAug 15, 2010
  13. Junio C HamanoAug 16, 2010
  14. Ævar Arnfjörð BjarmasonAug 16, 2010
  15. log: test for regression introduced in v1.7.2-rc0~103^2~2Ævar Arnfjörð Bjarmason, Aug 15, 2010
  16. Constantine PlotnikovAug 17, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.