mirror of
https://github.com/git/git
synced 2024-09-17 23:41:33 +00:00
8b8e862490
When parsing the config file, if there is a value that is
syntactically correct but unused, we generally ignore it.
This lets non-core porcelains store arbitrary information in
the config file, and it means that configuration files can
be shared between new and old versions of git (the old
versions might simply ignore certain configuration).
The one exception to this is color configuration; if we
encounter a color.{diff,branch,status}.$slot variable, we
die if it is not one of the recognized slots (presumably as
a safety valve for user misconfiguration). This behavior
has existed since 801235c (diff --color: use
$GIT_DIR/config, 2006-06-24), but hasn't yet caused a
problem. No porcelain has wanted to store extra colors, and
we once a color area (like color.diff) has been introduced,
we've never changed the set of color slots.
However, that changed recently with the addition of
color.diff.func. Now a user with color.diff.func in their
config can no longer freely switch between v1.6.6 and older
versions; the old versions will complain about the existence
of the variable.
This patch loosens the check to match the rest of
git-config; unknown color slots are simply ignored. This
doesn't fix this particular problem, as the older version
(without this patch) is the problem, but it at least
prevents it from happening again in the future.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
87 lines
1.7 KiB
Bash
Executable file
87 lines
1.7 KiB
Bash
Executable file
#!/bin/sh
|
||
#
|
||
# Copyright (c) 2008 Timo Hirvonen
|
||
#
|
||
|
||
test_description='Test diff/status color escape codes'
|
||
. ./test-lib.sh
|
||
|
||
color()
|
||
{
|
||
git config diff.color.new "$1" &&
|
||
test "`git config --get-color diff.color.new`" = "$2"
|
||
}
|
||
|
||
invalid_color()
|
||
{
|
||
git config diff.color.new "$1" &&
|
||
test -z "`git config --get-color diff.color.new 2>/dev/null`"
|
||
}
|
||
|
||
test_expect_success 'reset' '
|
||
color "reset" "[m"
|
||
'
|
||
|
||
test_expect_success 'attribute before color name' '
|
||
color "bold red" "[1;31m"
|
||
'
|
||
|
||
test_expect_success 'color name before attribute' '
|
||
color "red bold" "[1;31m"
|
||
'
|
||
|
||
test_expect_success 'attr fg bg' '
|
||
color "ul blue red" "[4;34;41m"
|
||
'
|
||
|
||
test_expect_success 'fg attr bg' '
|
||
color "blue ul red" "[4;34;41m"
|
||
'
|
||
|
||
test_expect_success 'fg bg attr' '
|
||
color "blue red ul" "[4;34;41m"
|
||
'
|
||
|
||
test_expect_success '256 colors' '
|
||
color "254 bold 255" "[1;38;5;254;48;5;255m"
|
||
'
|
||
|
||
test_expect_success 'color too small' '
|
||
invalid_color "-2"
|
||
'
|
||
|
||
test_expect_success 'color too big' '
|
||
invalid_color "256"
|
||
'
|
||
|
||
test_expect_success 'extra character after color number' '
|
||
invalid_color "3X"
|
||
'
|
||
|
||
test_expect_success 'extra character after color name' '
|
||
invalid_color "redX"
|
||
'
|
||
|
||
test_expect_success 'extra character after attribute' '
|
||
invalid_color "dimX"
|
||
'
|
||
|
||
test_expect_success 'unknown color slots are ignored (diff)' '
|
||
git config --unset diff.color.new
|
||
git config color.diff.nosuchslotwilleverbedefined white &&
|
||
git diff --color
|
||
'
|
||
|
||
test_expect_success 'unknown color slots are ignored (branch)' '
|
||
git config color.branch.nosuchslotwilleverbedefined white &&
|
||
git branch -a
|
||
'
|
||
|
||
test_expect_success 'unknown color slots are ignored (status)' '
|
||
git config color.status.nosuchslotwilleverbedefined white || exit
|
||
git status
|
||
case $? in 0|1) : ok ;; *) false ;; esac
|
||
'
|
||
|
||
test_done
|