undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jl/some-submodule-config-are-not-boolean'

Browse Source 
* jl/some-submodule-config-are-not-boolean:
  avoid segfault on submodule.*.path set to an empty "true"
This commit is contained in:
Junio C Hamano 2013-09-04 12:36:51 -07:00
commit 5fb0e0868c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodule.c
View File

@ -134,6 +134,9 @@ int parse_submodule_config_option(const char *var, const char *value)
return 0; return 0;
if (!strcmp(key, "path")) { if (!strcmp(key, "path")) {
if (!value)
return config_error_nonbool(var);
config = unsorted_string_list_lookup(&config_name_for_path, value); config = unsorted_string_list_lookup(&config_name_for_path, value);
if (config) if (config)
free(config->util); free(config->util);
@ -151,6 +154,9 @@ int parse_submodule_config_option(const char *var, const char *value)
} else if (!strcmp(key, "ignore")) { } else if (!strcmp(key, "ignore")) {
char *name_cstr; char *name_cstr;
if (!value)
return config_error_nonbool(var);
if (strcmp(value, "untracked") && strcmp(value, "dirty") && if (strcmp(value, "untracked") && strcmp(value, "dirty") &&
strcmp(value, "all") && strcmp(value, "none")) { strcmp(value, "all") && strcmp(value, "none")) {
warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var); warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var);

10
t/t7400-submodule-basic.sh
View File

@ -18,6 +18,16 @@ test_expect_success 'setup - initial commit' '
git branch initial 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' ' test_expect_success 'setup - repository in init subdirectory' '
mkdir init && mkdir init &&
( (