path: root/t/
diff options
authorJeff King <>2009-12-12 12:25:24 (GMT)
committerJunio C Hamano <>2009-12-16 20:45:16 (GMT)
commit8b8e862490bba040299905cc0541560f24a11c41 (patch)
tree12975833d6bfd1b0b8fa6826347ae5b9eeb65fca /t/
parent06500a029953164a3110c705ae579ef43548d006 (diff)
ignore unknown color configuration
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 17 insertions, 0 deletions
diff --git a/t/ b/t/
index b61e516..5ade44c 100755
--- a/t/
+++ b/t/
@@ -66,4 +66,21 @@ test_expect_success 'extra character after attribute' '
invalid_color "dimX"
+test_expect_success 'unknown color slots are ignored (diff)' '
+ git config --unset
+ 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