Skip to content

Commit f3d5bbb

Browse files
committed
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
2 parents f4d3af1 + 5ea3048 commit f3d5bbb

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

submodule-config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ static int parse_config(const char *var, const char *value, void *data)
333333
strcmp(value, "all") &&
334334
strcmp(value, "none"))
335335
warning("Invalid parameter '%s' for config option "
336-
"'submodule.%s.ignore'", value, var);
336+
"'submodule.%s.ignore'", value, name.buf);
337337
else {
338338
free((void *) submodule->ignore);
339339
submodule->ignore = xstrdup(value);

0 commit comments

Comments
 (0)