diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-06 08:56:07 -0700 |
| commit | 276328ffb87cefdc515bee5f09916aea6e0244ed (patch) | |
| tree | 162b276adac033e8a41266071e046f0f4cf4cd6d /builtin-blame.c | |
| parent | 048f2762007d022defceb6850a44bc1bd5ccebf7 (diff) | |
| parent | e261cf94848d31868c21fb11cade51c30dfcdbe7 (diff) | |
| download | git-276328ffb87cefdc515bee5f09916aea6e0244ed.tar.gz | |
Merge branch 'maint'
* maint:
Update release notes for 1.6.0.3
Teach rebase -i to honor pre-rebase hook
docs: describe pre-rebase hook
do not segfault if make_cache_entry failed
make prefix_path() never return NULL
fix bogus "diff --git" header from "diff --no-index"
Fix fetch/clone --quiet when stdout is connected
builtin-blame: Fix blame -C -C with submodules.
bash: remove fetch, push, pull dashed form leftovers
Conflicts:
diff.c
Diffstat (limited to 'builtin-blame.c')
| -rw-r--r-- | builtin-blame.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 6b7b9f4466..df537593d0 100644 --- 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; |