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 57c46840d542f31dd4e42455140fc901f1eeb671..9db7cfe74c7a8583995e6c20c4eedebf58391fbc 100644 (file)
--- 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));
 
        int i;
        nargv = xmalloc(sizeof(char *) * (argc + 2));
 

-       nargv[0] = "blame";
+       nargv[0] = "annotate";

        nargv[1] = "-c";
 
        for (i = 1; i < argc; i++) {
        nargv[1] = "-c";
 
        for (i = 1; i < argc; i++) {

diff --git a/builtin-blame.c b/builtin-blame.c
index a18ef81a14da390cd7580c99c7b1682ccfff5ddd..69fc145a38090488e8da4b60a56154fc999b6fe5 100644 (file)
--- 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 show_root;
 static int blank_boundary;
 static int incremental;

+static int cmd_is_annotate;

 
 #ifndef DEBUG
 #define DEBUG 0
 
 #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) {
                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('^');
                        }
                                length--;
                                putchar('^');
                        }

-                       else
-                               memset(hex, ' ', length);

                }
 
                printf("%.*s", length, hex);
                }
 
                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;
 
        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;
 
        git_config(git_blame_config);
        save_commit_buffer = 0;