From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Feb 2008 21:09:16 +0000 (-0800)
Subject: builtin-log.c: guard config parser from value=NULL
X-Git-Tag: v1.5.4.2~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=90f5c1864caf40ac2a0fef6bc771eab3ecc561b6;p=git.git

builtin-log.c: guard config parser from value=NULL

format.suffix expects a string value.  format.numbered is bool plus "auto"

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-log.c b/builtin-log.c
index 9458428a8..99d69f079 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -432,7 +432,7 @@ static int git_format_config(const char *var, const char *value)
 	}
 	if (!strcmp(var, "format.suffix")) {
 		if (!value)
-			die("format.suffix without value");
+			return config_error_nonbool(var);
 		fmt_patch_suffix = xstrdup(value);
 		return 0;
 	}
@@ -440,11 +440,10 @@ static int git_format_config(const char *var, const char *value)
 		return 0;
 	}
 	if (!strcmp(var, "format.numbered")) {
-		if (!strcasecmp(value, "auto")) {
+		if (value && !strcasecmp(value, "auto")) {
 			auto_number = 1;
 			return 0;
 		}
-
 		numbered = git_config_bool(var, value);
 		return 0;
 	}