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

fatal: internal error in diff-resolve-rename-copy

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Jul 5, 2010, 12:05 UTC
Message-ID
<4C31CA75.9010709@drmicha.warpmail.net>
Hi there,

can someone help me with understanding or debugging the following? With "log -p --stat" I get that strange fatal error. (With GIT_FLUSH=0 it appears upfront.)

Without "-p --stat" the log is displayed without a fatal error (same 3 commits), but with "-p" or "--stat" (or both) it's fatal.

I suspect the error is out right before the problematic commit, which is shown with an empty diffstat.

I did this from a subdir, but the same happens from the root of the worktree.

git show on the last commit "7896762" shows the creation of a binary blob "Formular_Lehrverpflichtung_SS09.odt", and "show --stat" gives the expected stat. What problem could log -p --stat have?

Michael
GIT_FLUSH=1 git log -p  --stat --follow   Formular\ Lehrverpflichtung\
SS\ 2009_FakIII.odt
commit b7a1918f2712fdd8f0de3fa08510ef5f2b9e4428
Author: Michael J Gruber <gruber@m>
Date:   Thu Feb 18 16:40:37 2010 +0100
    clean up
---
 .../Formular Lehrverpflichtung SS 2009_FakIII.odt  |  Bin 13951 ->
13951 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/Formular Lehrverpflichtung SS 2009_FakIII.odt
b/LVVO/Formular Lehrverpflichtung SS 2009_FakIII.odt
similarity index 100%
rename from Formular Lehrverpflichtung SS 2009_FakIII.odt
rename to LVVO/Formular Lehrverpflichtung SS 2009_FakIII.odt

commit 223e14515f1d2f50d0985e8b2d100e47e0bdde81
Author: Michael J Gruber <gruber@m>
Date:   Wed Jul 8 16:39:10 2009 +0200

    make LVVO names uniform
---
 ...> Formular Lehrverpflichtung SS 2009_FakIII.odt |  Bin 13951 ->
13951 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/Formular_Lehrverpflichtung_SS09.odt b/Formular
Lehrverpflichtung SS 2009_FakIII.odt
similarity index 100%
rename from Formular_Lehrverpflichtung_SS09.odt
rename to Formular Lehrverpflichtung SS 2009_FakIII.odt
fatal: internal error in diff-resolve-rename-copy

commit 78967623b839ec174e2ed3cb4bf30e27b4d38481
Author: Michael J Gruber <gruber@m>
Date:   Wed Jul 8 16:37:29 2009 +0200

    Lehrverpflichtung SS09
---
Next: Alex Riesen
Message 1 of 4 in “fatal: internal error in diff-resolve-rename-copy”
  1. Michael J GruberJul 5, 2010
  2. Alex RiesenJul 5, 2010
  3. Michael J GruberJul 6, 2010
  4. Alex RiesenJul 7, 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.