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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 836f731873c9d4a25622fc393ebe392355290d75..93ecd728ab62b6bf988e52c1c7e7f71f867158e8 100644 (file)
--- 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
 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
 +
 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

diff --git a/color.c b/color.c
index 63e7b0c9a1db05aadeda8e920be06a9e3822dc46..a22d83584211c0c5d2f57b5ffe48b896eabbf904 100644 (file)
--- a/color.c
+++ b/color.c
@@ -141,8 +141,10 @@ static int parse_attr(const char *name, size_t len)
        int negate = 0;
        int i;
 
        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;
                negate = 1;

+       }

 
        for (i = 0; i < ARRAY_SIZE(attrs); i++) {
                if (attrs[i].len == len && !memcmp(attrs[i].name, name, len))
 
        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 2b32c4fbe67d9dc0a43fc7858ddd3ac400b6171f..2065752ff9e8f278d83ff651a04a75f5c6a992b6 100755 (executable)
--- 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"
 '
 
        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"
 '
 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"
 '