handle_path_include: don't look at NULL value

When we see config like: [include] path the expand_user_path helper notices that the config value is empty, but we then dereference NULL while printing the error message (glibc will helpfully print "(null)" for us here, but we cannot rely on that). $ git -c include.path rev-parse error: Could not expand include path '(null)' fatal: unable to parse command-line config Instead of tweaking our message, let's actually use config_error_nonbool to match other config variables that expect a value: $ git -c include.path rev-parse error: Missing value for 'include.path' fatal: unable to parse command-line config Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 27, 2014 at 20:37 UTC 67beb600563cf28186f44450e528df1ec4d524fd
1 file changed +5 -1
config.c
+5 -1
@@ -37,8 +37,12 @@ static int handle_path_include(const char *path, struct config_include_data *inc
37 {
38 int ret = 0;
39 struct strbuf buf = STRBUF_INIT;
40 - char *expanded = expand_user_path(path);
40 + char *expanded;
41
42 + if (!path)
43 + return config_error_nonbool("include.path");
44 +
45 + expanded = expand_user_path(path);
46 if (!expanded)
47 return error("Could not expand include path '%s'", path);
48 path = expanded;