diff options
| author | Jeff King <peff@peff.net> | 2016-06-23 13:38:44 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-23 11:32:51 -0700 |
| commit | 5621068f3d3c537b79b76201928c0b06025479ee (patch) | |
| tree | dbb28952f325a01983a48efb2de98682fa165159 | |
| parent | df8e472cc1bbd14a60d22b0b124f07046c6e1fa2 (diff) | |
| download | git-5621068f3d3c537b79b76201928c0b06025479ee.tar.gz | |
color: allow "no-" for negating attributes
Using "no-bold" rather than "nobold" is easier to read and
more natural to type (to me, anyway, even though I was the
person who introduced "nobold" in the first place). It's
easy to allow both.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | color.c | 4 | ||||
| -rwxr-xr-x | t/t4026-color.sh | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 836f731873..93ecd728ab 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -163,7 +163,7 @@ hex, like `#ff0ab3`. The accepted attributes are `bold`, `dim`, `ul`, `blink`, and `reverse`. The position of any attributes with respect to the colors (before, after, or in between), doesn't matter. Specific attributes may be turned off -by prefixing them with `no` (e.g., `noreverse`, `noul`, etc). +by prefixing them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc). + For git's pre-defined color slots, the attributes are meant to be reset at the beginning of each item in the colored output. So setting @@ -141,8 +141,10 @@ static int parse_attr(const char *name, size_t len) int negate = 0; int i; - if (skip_prefix_mem(name, len, "no", &name, &len)) + if (skip_prefix_mem(name, len, "no", &name, &len)) { + skip_prefix_mem(name, len, "-", &name, &len); negate = 1; + } for (i = 0; i < ARRAY_SIZE(attrs); i++) { if (attrs[i].len == len && !memcmp(attrs[i].name, name, len)) diff --git a/t/t4026-color.sh b/t/t4026-color.sh index 2b32c4fbe6..2065752ff9 100755 --- a/t/t4026-color.sh +++ b/t/t4026-color.sh @@ -50,6 +50,10 @@ test_expect_success 'attr negation' ' color "nobold nodim noul noblink noreverse" "[22;24;25;27m" ' +test_expect_success '"no-" variant of negation' ' + color "no-bold no-blink" "[22;25m" +' + test_expect_success 'long color specification' ' color "254 255 bold dim ul blink reverse" "[1;2;4;5;7;38;5;254;48;5;255m" ' |