log-tree: allow to customize 'grafted' color

Commit 76f5df305b (log: decorate grafted commits with "grafted" -
2011-08-18) lets us decorate grafted commits but I forgot about the
color.decorate.* config.

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/Documentation/config.txt b/Documentation/config.txt
index a6cd53b59c2818b7a75eb8ab92e8a73b5ddf6df5..4bb1b6f9af70dcc7403db6d84b183dcbe6808902 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1162,7 +1162,8 @@ color.diff.<slot>::
 color.decorate.<slot>::
        Use customized color for 'git log --decorate' output.  `<slot>` is one
        of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
 color.decorate.<slot>::
        Use customized color for 'git log --decorate' output.  `<slot>` is one
        of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local

-       branches, remote-tracking branches, tags, stash and HEAD, respectively.
+       branches, remote-tracking branches, tags, stash and HEAD, respectively
+       and `grafted` for grafted commits.

 
 color.grep::
        When set to `always`, always highlight matches.  When `false` (or
 
 color.grep::
        When set to `always`, always highlight matches.  When `false` (or

diff --git a/log-tree.c b/log-tree.c
index 30706fe9266b2082494170e4362b03c820a0bee5..888c236aa30c03f6ada90e063cbf11b93f4b9c68 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -34,6 +34,7 @@ static const char *color_decorate_slots[] = {
        [DECORATION_REF_TAG]    = "tag",
        [DECORATION_REF_STASH]  = "stash",
        [DECORATION_REF_HEAD]   = "HEAD",
        [DECORATION_REF_TAG]    = "tag",
        [DECORATION_REF_STASH]  = "stash",
        [DECORATION_REF_HEAD]   = "HEAD",

+       [DECORATION_GRAFTED]    = "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)