Merge branch 'ta/pretty-parse-config' into next

* ta/pretty-parse-config:
  pretty.c: make git_pretty_formats_config return -1 on git_config_string failure

1 files changed, 3 insertions, 1 deletions

diff --git a/pretty.c b/pretty.c
index 31fc76b2fd..44b9f64372 100644
--- a/pretty.c
+++ b/pretty.c
@@ -70,7 +70,9 @@ static int git_pretty_formats_config(const char *var, const char *value, void *c
 
 	commit_format->name = xstrdup(name);
 	commit_format->format = CMIT_FMT_USERFORMAT;
-	git_config_string(&fmt, var, value);
+	if (git_config_string(&fmt, var, value))
+		return -1;
+
 	if (starts_with(fmt, "format:") || starts_with(fmt, "tformat:")) {
 		commit_format->is_tformat = fmt[0] == 't';
 		fmt = strchr(fmt, ':') + 1;