From: Junio C Hamano <junkio@cox.net>
Date: Wed, 29 Nov 2006 06:32:41 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.0-rc0~182
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/2570458fdaeb577eb60e470bee0f7065dd2058b8?hp=1ca7558dd838e82f6f6b8611b981654fa4ecde2b

Merge branch 'maint'

* maint:
git blame -C: fix output format tweaks when crossing file boundary.
---

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;