mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make config --add behave correctly for empty and NULL values

Browse Source 
Currently if we have a config file like,
[foo]
        baz
        bar =

and we try something like, "git config --add foo.baz roll", Git will
segfault. Moreover, for "git config --add foo.bar roll", it will
overwrite the original value instead of appending after the existing
empty value.

The problem lies with the regexp used for simulating --add in
`git_config_set_multivar_in_file()`, "^$", which in ideal case should
not match with any string but is true for empty strings. Instead use a
regexp like "a^" which can not be true for any string, empty or not.

For removing the segfault add a check for NULL values in `matches()` in
config.c.

Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tanay Abhra
2014-08-18 03:17:57 -07:00
committed by Junio C Hamano
parent 32f56600bb
commit c8466645ed
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/config.c
View File

@ -599,7 +599,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
check_argc(argc, 2, 2); check_argc(argc, 2, 2);
value = normalize_value(argv[0], argv[1]); value = normalize_value(argv[0], argv[1]);
return git_config_set_multivar_in_file(given_config_source.file, return git_config_set_multivar_in_file(given_config_source.file,
argv[0], value, "^$", 0); argv[0], value, "a^", 0);
} }
else if (actions == ACTION_REPLACE_ALL) { else if (actions == ACTION_REPLACE_ALL) {
check_write(); check_write();

2
config.c
View File

@ -1233,7 +1233,7 @@ static int matches(const char *key, const char *value)
return !strcmp(key, store.key) && return !strcmp(key, store.key) &&
(store.value_regex == NULL || (store.value_regex == NULL ||
(store.do_not_match ^ (store.do_not_match ^
!regexec(store.value_regex, value, 0, NULL, 0))); (value && !regexec(store.value_regex, value, 0, NULL, 0))));
} }
static int store_aux(const char *key, const char *value, void *cb) static int store_aux(const char *key, const char *value, void *cb)

20
t/t1303-wacky-config.sh
View File

@ -111,4 +111,24 @@ test_expect_success 'unset many entries' '
test_must_fail git config section.key test_must_fail git config section.key
' '
test_expect_success '--add appends new value after existing empty value' '
cat >expect <<-\EOF &&
fool
roll
EOF
cp .git/config .git/config.old &&
test_when_finished "mv .git/config.old .git/config" &&
cat >.git/config <<-\EOF &&
[foo]
baz
baz =
baz = fool
EOF
git config --add foo.baz roll &&
git config --get-all foo.baz >output &&
test_cmp expect output
'
test_done test_done