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>
This commit is contained in:
parent
3c17c34ac7
commit
90f5c1864c
@ -432,7 +432,7 @@ static int git_format_config(const char *var, const char *value)
|
|||||||
}
|
}
|
||||||
if (!strcmp(var, "format.suffix")) {
|
if (!strcmp(var, "format.suffix")) {
|
||||||
if (!value)
|
if (!value)
|
||||||
die("format.suffix without value");
|
return config_error_nonbool(var);
|
||||||
fmt_patch_suffix = xstrdup(value);
|
fmt_patch_suffix = xstrdup(value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -440,11 +440,10 @@ static int git_format_config(const char *var, const char *value)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
if (!strcmp(var, "format.numbered")) {
|
if (!strcmp(var, "format.numbered")) {
|
||||||
if (!strcasecmp(value, "auto")) {
|
if (value && !strcasecmp(value, "auto")) {
|
||||||
auto_number = 1;
|
auto_number = 1;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
numbered = git_config_bool(var, value);
|
numbered = git_config_bool(var, value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user