Browse Source

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
maint
Junio C Hamano 8 years ago
parent
commit
f3d5bbb283
  1. 2
      submodule-config.c

2
submodule-config.c

@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data) @@ -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);

Loading…
Cancel
Save