log: decorate grafted commits with "grafted"

In shallow repositories, this may help detect whether a branch ends,
or it is deeper than current depth.

It also show graft points that extend a branch.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/log-tree.c b/log-tree.c
index 344f7347cc4967fe3e51c5c7b99d5809afe97ec1..56052441e253e6fb69609edd21909f008eb0d360 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -18,6 +18,7 @@ enum decoration_type {
        DECORATION_REF_TAG,
        DECORATION_REF_STASH,
        DECORATION_REF_HEAD,
        DECORATION_REF_TAG,
        DECORATION_REF_STASH,
        DECORATION_REF_HEAD,

+       DECORATION_GRAFTED,

 };
 
 static char decoration_colors[][COLOR_MAXLEN] = {
 };
 
 static char decoration_colors[][COLOR_MAXLEN] = {


@@ -27,6 +28,7 @@ static char decoration_colors[][COLOR_MAXLEN] = {
        GIT_COLOR_BOLD_YELLOW,  /* REF_TAG */
        GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
        GIT_COLOR_BOLD_CYAN,    /* REF_HEAD */
        GIT_COLOR_BOLD_YELLOW,  /* REF_TAG */
        GIT_COLOR_BOLD_MAGENTA, /* REF_STASH */
        GIT_COLOR_BOLD_CYAN,    /* REF_HEAD */

+       GIT_COLOR_BOLD_BLUE,    /* GRAFTED */

 };
 
 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)
 };
 
 static const char *decorate_get_color(int decorate_use_color, enum decoration_type ix)


@@ -118,6 +120,15 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
        return 0;
 }
 
        return 0;
 }
 

+static int add_graft_decoration(const struct commit_graft *graft, void *cb_data)
+{
+       struct commit *commit = lookup_commit(graft->sha1);
+       if (!commit)
+               return 0;
+       add_name_decoration(DECORATION_GRAFTED, "grafted", &commit->object);
+       return 0;
+}
+

 void load_ref_decorations(int flags)
 {
        static int loaded;
 void load_ref_decorations(int flags)
 {
        static int loaded;


@@ -125,6 +136,7 @@ void load_ref_decorations(int flags)
                loaded = 1;
                for_each_ref(add_ref_decoration, &flags);
                head_ref(add_ref_decoration, &flags);
                loaded = 1;
                for_each_ref(add_ref_decoration, &flags);
                head_ref(add_ref_decoration, &flags);

+               for_each_commit_graft(add_graft_decoration, NULL);

        }
 }
 
        }
 }