summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--builtin-annotate.c2
-rw-r--r--builtin-blame.c9
2 files changed, 7 insertions, 4 deletions
diff --git a/builtin-annotate.c b/builtin-annotate.c
index 57c4684..9db7cfe 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 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;