diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:42 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:42 +0900 |
commit | 8f2b7352a79662e3dfa62a30d2dfb5d2717b1646 (patch) | |
tree | b84222b524498914a9bd19212023341b38735ba7 /submodule-config.c | |
parent | 63b33047c1428dbf4f480b384962c6c8c0e841dd (diff) | |
download | git-8f2b7352a79662e3dfa62a30d2dfb5d2717b1646.tar.gz git-8f2b7352a79662e3dfa62a30d2dfb5d2717b1646.tar.bz2 git-8f2b7352a79662e3dfa62a30d2dfb5d2717b1646.zip |
Imported Upstream version 2.19.1upstream/2.19.1
Diffstat (limited to 'submodule-config.c')
-rw-r--r-- | submodule-config.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/submodule-config.c b/submodule-config.c index fc2c41b9..0b2f1647 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -384,6 +384,12 @@ static void warn_multiple_config(const struct object_id *treeish_name, commit_string, name, option); } +static void warn_command_line_option(const char *var, const char *value) +{ + warning(_("ignoring '%s' which may be interpreted as" + " a command-line option: %s"), var, value); +} + struct parse_config_parameter { struct submodule_cache *cache; const struct object_id *treeish_name; @@ -409,6 +415,8 @@ static int parse_config(const char *var, const char *value, void *data) if (!strcmp(item.buf, "path")) { if (!value) ret = config_error_nonbool(var); + else if (looks_like_command_line_option(value)) + warn_command_line_option(var, value); else if (!me->overwrite && submodule->path) warn_multiple_config(me->treeish_name, submodule->name, "path"); @@ -449,6 +457,8 @@ static int parse_config(const char *var, const char *value, void *data) } else if (!strcmp(item.buf, "url")) { if (!value) { ret = config_error_nonbool(var); + } else if (looks_like_command_line_option(value)) { + warn_command_line_option(var, value); } else if (!me->overwrite && submodule->url) { warn_multiple_config(me->treeish_name, submodule->name, "url"); |