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

[RFC PATCH (BUG)] builtin-blame: Fix blame -C -C with submodules.

From
Alexander Gavrilov <angavrilov@gmail.com>
Date
Oct 3, 2008, 16:23 UTC
Message-ID
<200810032023.50559.angavrilov@gmail.com>

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
Message 1 of 1 in “builtin-blame: Fix blame -C -C with submodules.”
  1. builtin-blame: Fix blame -C -C with submodules.Alexander Gavrilov, Oct 3, 2008

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.