X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=diff.c;h=08bbd3e9070996b38f4d34cedf7640d93aa5808d;hb=15caa41053c465aeabb1a0d2d3d3c12d701bc62d;hp=d952686926e2e97aab3e369ad192027b4d7e676b;hpb=e21a8577089cb10fed5f298796ba3685010dfaef;p=git.git

diff --git a/diff.c b/diff.c
index d95268692..08bbd3e90 100644
--- a/diff.c
+++ b/diff.c
@@ -63,7 +63,7 @@ static int parse_diff_color_slot(const char *var, int ofs)
 		return DIFF_WHITESPACE;
 	if (!strcasecmp(var+ofs, "func"))
 		return DIFF_FUNCINFO;
-	die("bad config variable '%s'", var);
+	return -1;
 }
 
 static int git_config_rename(const char *var, const char *value)
@@ -122,6 +122,8 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 
 	if (!prefixcmp(var, "diff.color.") || !prefixcmp(var, "color.diff.")) {
 		int slot = parse_diff_color_slot(var, 11);
+		if (slot < 0)
+			return 0;
 		if (!value)
 			return config_error_nonbool(var);
 		color_parse(value, var, diff_colors[slot]);