summaryrefslogtreecommitdiff
path: root/builtin-blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-06 09:52:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-06 09:52:04 (GMT)
commite68989a739d8b1c5effb898d1ac78d27ca9d313a (patch)
tree676b808ec78681a347bf2c766d57c19847c2277f /builtin-blame.c
parentc8f80d4dc89eddd4b343cb82ca8a75cfa41f800e (diff)
downloadgit-e68989a739d8b1c5effb898d1ac78d27ca9d313a.zip
git-e68989a739d8b1c5effb898d1ac78d27ca9d313a.tar.gz
git-e68989a739d8b1c5effb898d1ac78d27ca9d313a.tar.bz2
annotate: fix for cvsserver.
git-cvsserver does not want the boundary commits shown any differently. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-blame.c')
-rw-r--r--builtin-blame.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/builtin-blame.c b/builtin-blame.c
index a18ef81..69fc145 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;