diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-02 13:27:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-02 13:27:40 -0700 |
| commit | 51eeaea2108a4105542fe03935b411dfdbf5fe2b (patch) | |
| tree | 1f4970c473bcbb957d9f445aab0bb55e94989a05 | |
| parent | Merge branch 'bc/archive-pax-header-mode' (diff) | |
| parent | pretty.c: make git_pretty_formats_config return -1 on git_config_string failure (diff) | |
| download | tgif-51eeaea2108a4105542fe03935b411dfdbf5fe2b.tar.xz | |
Merge branch 'ta/pretty-parse-config'
* ta/pretty-parse-config:
pretty.c: make git_pretty_formats_config return -1 on git_config_string failure
| -rw-r--r-- | pretty.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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; |