Merge branch 'pb/gitweb'

[git.git] / builtin-blame.c

diff --git a/builtin-blame.c b/builtin-blame.c
index 6b7b9f4466989ca02d3a5e53caac9ff5c7e8a922..df537593d052f0b4d705eb1d0d19ed296f76a39d 100644 (file)
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1132,6 +1132,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;