зеркало из https://github.com/microsoft/git.git
Merge branch 'jl/some-submodule-config-are-not-boolean'
* jl/some-submodule-config-are-not-boolean: avoid segfault on submodule.*.path set to an empty "true"
This commit is contained in:
Коммит
5fb0e0868c
|
@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const char *value)
|
|||
return 0;
|
||||
|
||||
if (!strcmp(key, "path")) {
|
||||
if (!value)
|
||||
return config_error_nonbool(var);
|
||||
|
||||
config = unsorted_string_list_lookup(&config_name_for_path, value);
|
||||
if (config)
|
||||
free(config->util);
|
||||
|
@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const char *value)
|
|||
} else if (!strcmp(key, "ignore")) {
|
||||
char *name_cstr;
|
||||
|
||||
if (!value)
|
||||
return config_error_nonbool(var);
|
||||
|
||||
if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
|
||||
strcmp(value, "all") && strcmp(value, "none")) {
|
||||
warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);
|
||||
|
|
|
@ -18,6 +18,16 @@ test_expect_success 'setup - initial commit' '
|
|||
git branch initial
|
||||
'
|
||||
|
||||
test_expect_success 'configuration parsing' '
|
||||
test_when_finished "rm -f .gitmodules" &&
|
||||
cat >.gitmodules <<-\EOF &&
|
||||
[submodule "s"]
|
||||
path
|
||||
ignore
|
||||
EOF
|
||||
test_must_fail git status
|
||||
'
|
||||
|
||||
test_expect_success 'setup - repository in init subdirectory' '
|
||||
mkdir init &&
|
||||
(
|
||||
|
|
Загрузка…
Ссылка в новой задаче