diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-11-28 22:32:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-28 22:32:41 -0800 |
| commit | 2570458fdaeb577eb60e470bee0f7065dd2058b8 (patch) | |
| tree | 9bd2e4fd3770e44086d4e0fcb35a07bb57bdf9df | |
| parent | git-svn: fix multi-init (diff) | |
| parent | git blame -C: fix output format tweaks when crossing file boundary. (diff) | |
| download | tgif-2570458fdaeb577eb60e470bee0f7065dd2058b8.tar.xz | |
Merge branch 'maint'
* maint:
git blame -C: fix output format tweaks when crossing file boundary.
| -rw-r--r-- | builtin-blame.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin-blame.c b/builtin-blame.c index 066dee743e..53fed4501a 100644 --- a/builtin-blame.c +++ b/builtin-blame.c @@ -1435,14 +1435,14 @@ static void find_alignment(struct scoreboard *sb, int *option) struct commit_info ci; int num; + if (strcmp(suspect->path, sb->path)) + *option |= OUTPUT_SHOW_NAME; + num = strlen(suspect->path); + if (longest_file < num) + longest_file = num; if (!(suspect->commit->object.flags & METAINFO_SHOWN)) { suspect->commit->object.flags |= METAINFO_SHOWN; get_commit_info(suspect->commit, &ci, 1); - if (strcmp(suspect->path, sb->path)) - *option |= OUTPUT_SHOW_NAME; - num = strlen(suspect->path); - if (longest_file < num) - longest_file = num; num = strlen(ci.author); if (longest_author < num) longest_author = num; |