diff options
| author | Ramkumar Ramachandra <artagnon@gmail.com> | 2013-11-18 23:09:12 +0530 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-19 10:14:15 -0800 |
| commit | fddb74c94777351d549b2ddaa36612c41b2176f1 (patch) | |
| tree | d528aed0dd6a1086cc8600fe2c9aa5915a6f4817 | |
| parent | b28061ce0d2e31d390fee5a5724b8a061d0492a7 (diff) | |
| download | git-fddb74c94777351d549b2ddaa36612c41b2176f1.tar.gz | |
for-each-ref: introduce %(color:...) for color
Enhance 'git for-each-ref' with color formatting options. You can now
use the following format in for-each-ref:
%(color:green)%(refname:short)%(color:reset)
where color names are described in color.branch.*.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/git-for-each-ref.txt | 4 | ||||
| -rw-r--r-- | builtin/for-each-ref.c | 11 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 17 |
3 files changed, 30 insertions, 2 deletions
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index 92e82fdb02..94f5c465da 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -101,6 +101,10 @@ HEAD:: '*' if HEAD matches current ref (the checked out branch), ' ' otherwise. +color:: + Change output color. Followed by `:<colorname>`, where names + are described in `color.branch.*`. + In addition to the above, for commit and tag objects, the header field names (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the value in the header field. diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index 9e45abd40a..bc655b5042 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -9,6 +9,7 @@ #include "quote.h" #include "parse-options.h" #include "remote.h" +#include "color.h" /* Quoting styles */ #define QUOTE_NONE 0 @@ -76,6 +77,7 @@ static struct { { "symref" }, { "flag" }, { "HEAD" }, + { "color" }, }; /* @@ -662,8 +664,13 @@ static void populate_value(struct refinfo *ref) !branch->merge[0]->dst) continue; refname = branch->merge[0]->dst; - } - else if (!strcmp(name, "flag")) { + } else if (!prefixcmp(name, "color:")) { + char color[COLOR_MAXLEN] = ""; + + color_parse(name + 6, "--format", color); + v->s = xstrdup(color); + continue; + } else if (!strcmp(name, "flag")) { char buf[256], *cp = buf; if (ref->flag & REF_ISSYMREF) cp = copy_advance(cp, ",symref"); diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index d88d7acbdd..69e3155a62 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -343,6 +343,23 @@ test_expect_success 'Check for invalid refname format' ' test_must_fail git for-each-ref --format="%(refname:INVALID)" ' +get_color () +{ + git config --get-color no.such.slot "$1" +} + +cat >expected <<EOF +$(git rev-parse --short refs/heads/master) $(get_color green)master$(get_color reset) +$(git rev-parse --short refs/remotes/origin/master) $(get_color green)origin/master$(get_color reset) +$(git rev-parse --short refs/tags/testtag) $(get_color green)testtag$(get_color reset) +$(git rev-parse --short refs/tags/two) $(get_color green)two$(get_color reset) +EOF + +test_expect_success 'Check %(color:...) ' ' + git for-each-ref --format="%(objectname:short) %(color:green)%(refname:short)%(color:reset)" >actual && + test_cmp expected actual +' + cat >expected <<\EOF heads/master tags/master |