diff options
| author |  Tanay Abhra <tanayabh@gmail.com> | 2014-08-18 03:17:57 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-18 10:45:59 -0700 |
| commit | c8466645edd1413c7efed824f5bddac457eb77f9 (patch) | |
| tree | 1e0aa1584d4b7155e56f62bead24136ef54f8cde | |
| parent | Git 2.0.4 (diff) | |
| download | tgif-c8466645edd1413c7efed824f5bddac457eb77f9.tar.xz | |
make config --add behave correctly for empty and NULL values
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>
| -rw-r--r-- | builtin/config.c | 2 | ||||
| -rw-r--r-- | config.c | 2 | ||||
| -rwxr-xr-x | t/t1303-wacky-config.sh | 20 |
3 files changed, 22 insertions, 2 deletions
diff --git a/builtin/config.c b/builtin/config.c index 5677c942b6..8224699663 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -599,7 +599,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) check_argc(argc, 2, 2); value = normalize_value(argv[0], argv[1]); 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) { check_write(); @@ -1233,7 +1233,7 @@ static int matches(const char *key, const char *value) return !strcmp(key, store.key) && (store.value_regex == NULL || (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) diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh index 3a2c81968c..3b92083e19 100755 --- a/t/t1303-wacky-config.sh +++ b/t/t1303-wacky-config.sh @@ -111,4 +111,24 @@ test_expect_success 'unset many entries' ' 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 |