Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
mailinfo: tests for RFC2047 examples
[gitweb.git]
/
builtin-blame.c
diff --git
a/builtin-blame.c
b/builtin-blame.c
index 9bc901c2922403dcf73c8275da73d6d37d220729..101c4162dad22db14ac87257b53496ec558137aa 100644
(file)
--- 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;