* [RFC PATCH (BUG)] builtin-blame: Fix blame -C -C with submodules.
@ 2008-10-03 16:23 Alexander Gavrilov
0 siblings, 0 replies; only message in thread
From: Alexander Gavrilov @ 2008-10-03 16:23 UTC (permalink / raw)
To: Git Mailing List; +Cc: Junio C Hamano, Shawn O. Pearce
When performing copy detection, git-blame tries to
read gitlinks as blobs, which causes it to die.
This patch adds a check to skip them.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
---
I don't know if this is enough for all cases, but it fixes mine.
-- Alexander
$ git blame --incremental -C -C ImpactMessages.cpp
767f36d1ce2f361e9148bb23155e6aafad034f4b 6 6 10
...
767f36d1ce2f361e9148bb23155e6aafad034f4b 49 49 7
filename BackEnd/Impact/ImpactMessages.cpp
767f36d1ce2f361e9148bb23155e6aafad034f4b 57 57 1
filename BackEnd/Impact/ImpactMessages.cpp
767f36d1ce2f361e9148bb23155e6aafad034f4b 59 59 14
filename BackEnd/Impact/ImpactMessages.cpp
fatal: Cannot read blob 27152bb4f8b10d4ce5f9fa584c14511dceba3c06 for path BackEnd/Boost
builtin-blame.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/builtin-blame.c b/builtin-blame.c
index 9bc901c..101c416 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1136,6 +1136,8 @@ static int find_copy_in_parent(struct scoreboard *sb,
if (!DIFF_FILE_VALID(p->one))
continue; /* does not exist in parent */
+ if (S_ISGITLINK(p->one->mode))
+ continue; /* ignore git links */
if (porigin && !strcmp(p->one->path, porigin->path))
/* find_move already dealt with this path */
continue;
--
1.6.0.20.g6148bc
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2008-10-03 16:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-03 16:23 [RFC PATCH (BUG)] builtin-blame: Fix blame -C -C with submodules Alexander Gavrilov
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 NNTP newsgroup(s).