X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=builtin-blame.c;h=69fc145a38090488e8da4b60a56154fc999b6fe5;hb=204d409247e7bbc7848569462aa11a87e373c8d6;hp=a18ef81a14da390cd7580c99c7b1682ccfff5ddd;hpb=06e75a72372d0466e110002a7504fefebe0e9c52;p=thirdparty%2Fgit.git

diff --git a/builtin-blame.c b/builtin-blame.c
index a18ef81a14..69fc145a38 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;