From: Michael J Gruber <git@drmicha.warpmail.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: fatal: internal error in diff-resolve-rename-copy
Date: Mon, 05 Jul 2010 14:05:09 +0200 [thread overview]
Message-ID: <4C31CA75.9010709@drmicha.warpmail.net> (raw)
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 reply other threads:[~2010-07-05 12:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-05 12:05 Michael J Gruber [this message]
2010-07-05 18:20 ` fatal: internal error in diff-resolve-rename-copy Alex Riesen
2010-07-06 14:47 ` Michael J Gruber
2010-07-07 8:13 ` Alex Riesen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C31CA75.9010709@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).