diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:07:17 -0700 |
| commit | e15b9606557d590e1cdc1e3b1b9154cce455a4c8 (patch) | |
| tree | 4951cc0bb3d94cd4d511125a6bda01b177ba8858 /submodule-config.c | |
| parent | cbfbf443b0ec0efe2682156aea4119d3b6d619fd (diff) | |
| parent | 5ea304896e1e2bfbf104c4098df70f93b5952cfa (diff) | |
| download | git-e15b9606557d590e1cdc1e3b1b9154cce455a4c8.tar.gz | |
Merge branch 'sb/submodule-config-parse-ignore-fix'
Code to read submodule.<name>.ignore config did not state the
variable name correctly when giving an error message diagnosing
misconfiguration.
* sb/submodule-config-parse-ignore-fix:
submodule-config: correct error reporting for invalid ignore value
Diffstat (limited to 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index 93453909cf..bb069bc097 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data) strcmp(value, "all") && strcmp(value, "none")) warning("Invalid parameter '%s' for config option " - "'submodule.%s.ignore'", value, var); + "'submodule.%s.ignore'", value, name.buf); else { free((void *) submodule->ignore); submodule->ignore = xstrdup(value); |