mirror of
https://github.com/git/git.git
synced 2024-10-31 06:17:56 +01:00
c8466645ed
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>
134 lines
3 KiB
Bash
Executable file
134 lines
3 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test wacky input to git config'
|
|
. ./test-lib.sh
|
|
|
|
# Leaving off the newline is intentional!
|
|
setup() {
|
|
(printf "[section]\n" &&
|
|
printf " key = foo") >.git/config
|
|
}
|
|
|
|
# 'check section.key value' verifies that the entry for section.key is
|
|
# 'value'
|
|
check() {
|
|
echo "$2" >expected
|
|
git config --get "$1" >actual 2>&1
|
|
test_cmp actual expected
|
|
}
|
|
|
|
# 'check section.key regex value' verifies that the entry for
|
|
# section.key *that matches 'regex'* is 'value'
|
|
check_regex() {
|
|
echo "$3" >expected
|
|
git config --get "$1" "$2" >actual 2>&1
|
|
test_cmp actual expected
|
|
}
|
|
|
|
test_expect_success 'modify same key' '
|
|
setup &&
|
|
git config section.key bar &&
|
|
check section.key bar
|
|
'
|
|
|
|
test_expect_success 'add key in same section' '
|
|
setup &&
|
|
git config section.other bar &&
|
|
check section.key foo &&
|
|
check section.other bar
|
|
'
|
|
|
|
test_expect_success 'add key in different section' '
|
|
setup &&
|
|
git config section2.key bar &&
|
|
check section.key foo &&
|
|
check section2.key bar
|
|
'
|
|
|
|
SECTION="test.q\"s\\sq'sp e.key"
|
|
test_expect_success 'make sure git config escapes section names properly' '
|
|
git config "$SECTION" bar &&
|
|
check "$SECTION" bar
|
|
'
|
|
|
|
LONG_VALUE=$(printf "x%01021dx a" 7)
|
|
test_expect_success 'do not crash on special long config line' '
|
|
setup &&
|
|
git config section.key "$LONG_VALUE" &&
|
|
check section.key "$LONG_VALUE"
|
|
'
|
|
|
|
setup_many() {
|
|
setup &&
|
|
# This time we want the newline so that we can tack on more
|
|
# entries.
|
|
echo >>.git/config &&
|
|
# Semi-efficient way of concatenating 5^5 = 3125 lines. Note
|
|
# that because 'setup' already put one line, this means 3126
|
|
# entries for section.key in the config file.
|
|
cat >5to1 <<-\EOF &&
|
|
key = foo
|
|
key = foo
|
|
key = foo
|
|
key = foo
|
|
key = foo
|
|
EOF
|
|
cat 5to1 5to1 5to1 5to1 5to1 >5to2 && # 25
|
|
cat 5to2 5to2 5to2 5to2 5to2 >5to3 && # 125
|
|
cat 5to3 5to3 5to3 5to3 5to3 >5to4 && # 635
|
|
cat 5to4 5to4 5to4 5to4 5to4 >>.git/config # 3125
|
|
}
|
|
|
|
test_expect_success 'get many entries' '
|
|
setup_many &&
|
|
git config --get-all section.key >actual &&
|
|
test_line_count = 3126 actual
|
|
'
|
|
|
|
test_expect_success 'get many entries by regex' '
|
|
setup_many &&
|
|
git config --get-regexp "sec.*ke." >actual &&
|
|
test_line_count = 3126 actual
|
|
'
|
|
|
|
test_expect_success 'add and replace one of many entries' '
|
|
setup_many &&
|
|
git config --add section.key bar &&
|
|
check_regex section.key "b.*r" bar &&
|
|
git config section.key beer "b.*r" &&
|
|
check_regex section.key "b.*r" beer
|
|
'
|
|
|
|
test_expect_success 'replace many entries' '
|
|
setup_many &&
|
|
git config --replace-all section.key bar &&
|
|
check section.key bar
|
|
'
|
|
|
|
test_expect_success 'unset many entries' '
|
|
setup_many &&
|
|
git config --unset-all 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
|