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>
This commit is contained in:
Jeff King
2016-06-23 13:38:44 -04:00
committed by Junio C Hamano
parent df8e472cc1
commit 5621068f3d
3 changed files with 8 additions and 2 deletions

View File

@@ -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))