From: Junio C Hamano <junkio@cox.net>
Date: Tue, 6 Feb 2007 09:52:04 +0000 (-0800)
Subject: annotate: fix for cvsserver.
X-Git-Tag: v1.5.0-rc4~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e68989a739d8b1c5effb898d1ac78d27ca9d313a;p=git.git

annotate: fix for cvsserver.

git-cvsserver does not want the boundary commits shown any differently.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-annotate.c b/builtin-annotate.c
index 57c46840d..9db7cfe74 100644
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -12,7 +12,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
 	int i;
 	nargv = xmalloc(sizeof(char *) * (argc + 2));
 
-	nargv[0] = "blame";
+	nargv[0] = "annotate";
 	nargv[1] = "-c";
 
 	for (i = 1; i < argc; i++) {
diff --git a/builtin-blame.c b/builtin-blame.c
index a18ef81a1..69fc145a3 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -41,6 +41,7 @@ static int max_score_digits;
 static int show_root;
 static int blank_boundary;
 static int incremental;
+static int cmd_is_annotate;
 
 #ifndef DEBUG
 #define DEBUG 0
@@ -1554,12 +1555,12 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt)
 		int length = (opt & OUTPUT_LONG_OBJECT_NAME) ? 40 : 8;
 
 		if (suspect->commit->object.flags & UNINTERESTING) {
-			if (!blank_boundary) {
+			if (blank_boundary)
+				memset(hex, ' ', length);
+			else if (!cmd_is_annotate) {
 				length--;
 				putchar('^');
 			}
-			else
-				memset(hex, ' ', length);
 		}
 
 		printf("%.*s", length, hex);
@@ -2070,6 +2071,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	const char *bottomtop = NULL;
 	const char *contents_from = NULL;
 
+	cmd_is_annotate = !strcmp(argv[0], "annotate");
+
 	git_config(git_blame_config);
 	save_commit_buffer = 0;