diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-24 12:57:52 -0700 |
| commit | f3d5bbb28322307592f9e5f5f21e69ff0249eea7 (patch) | |
| tree | c5b8918e92baf9943e7e4723f3229a002b604dd0 | |
| parent | Merge branch 'jk/push-deadlock-regression-fix' into maint (diff) | |
| parent | submodule-config: correct error reporting for invalid ignore value (diff) | |
| download | tgif-f3d5bbb28322307592f9e5f5f21e69ff0249eea7.tar.xz | |
Merge branch 'sb/submodule-config-parse-ignore-fix' into maint
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
| -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); |