mirror of
https://github.com/git/git.git
synced 2024-11-28 04:23:30 +08:00
9e2d884d0f
Fix numerous and mostly long-standing segfaults in consumers of the *_config_*value_multi() API. As discussed in the preceding commit an empty key in the config syntax yields a "NULL" string, which these users would give to strcmp() (or similar), resulting in segfaults. As this change shows, most users users of the *_config_*value_multi() API didn't really want such an an unsafe and low-level API, let's give them something with the safety of git_config_get_string() instead. This fix is similar to what the *_string() functions and others acquired in[1] and [2]. Namely introducing and using a safer "*_get_string_multi()" variant of the low-level "_*value_multi()" function. This fixes segfaults in code introduced in: -d811c8e17c(versionsort: support reorder prerelease suffixes, 2015-02-26) -c026557a37(versioncmp: generalize version sort suffix reordering, 2016-12-08) -a086f921a7(submodule: decouple url and submodule interest, 2017-03-17) -a6be5e6764(log: add log.excludeDecoration config option, 2020-04-16) -92156291ca(log: add default decoration filter, 2022-08-05) -50a044f1e4(gc: replace config subprocesses with API calls, 2022-09-27) There are now two users ofthe low-level API: - One in "builtin/for-each-repo.c", which we'll convert in a subsequent commit. - The "t/helper/test-config.c" code added in [3]. As seen in the preceding commit we need to give the "t/helper/test-config.c" caller these "NULL" entries. We could also alter the underlying git_configset_get_value_multi() function to be "string safe", but doing so would leave no room for other variants of "*_get_value_multi()" that coerce to other types. Such coercion can't be built on the string version, since as we've established "NULL" is a true value in the boolean context, but if we coerced it to "" for use in a list of strings it'll be subsequently coerced to "false" as a boolean. The callback pattern being used here will make it easy to introduce e.g. a "multi" variant which coerces its values to "bool", "int", "path" etc. 1.40ea4ed903(Add config_error_nonbool() helper function, 2008-02-11) 2.6c47d0e8f3(config.c: guard config parser from value=NULL, 2008-02-11). 3.4c715ebb96(test-config: add tests for the config_set API, 2014-07-28) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
129 lines
4.4 KiB
Bash
Executable File
129 lines
4.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Test with test-tool submodule is-active
|
|
|
|
This test verifies that `test-tool submodule is-active` correctly identifies
|
|
submodules which are "active" and interesting to the user.
|
|
|
|
This is a unit test of the submodule.c is_submodule_active() function,
|
|
which is also indirectly tested elsewhere.
|
|
'
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
git config --global protocol.file.allow always &&
|
|
git init sub &&
|
|
test_commit -C sub initial &&
|
|
git init super &&
|
|
test_commit -C super initial &&
|
|
git -C super submodule add ../sub sub1 &&
|
|
git -C super submodule add ../sub sub2 &&
|
|
|
|
# Remove submodule.<name>.active entries in order to test in an
|
|
# environment where only URLs are present in the conifg
|
|
git -C super config --unset submodule.sub1.active &&
|
|
git -C super config --unset submodule.sub2.active &&
|
|
|
|
git -C super commit -a -m "add 2 submodules at sub{1,2}"
|
|
'
|
|
|
|
test_expect_success 'is-active works with urls' '
|
|
test-tool -C super submodule is-active sub1 &&
|
|
test-tool -C super submodule is-active sub2 &&
|
|
|
|
git -C super config --unset submodule.sub1.URL &&
|
|
test_must_fail test-tool -C super submodule is-active sub1 &&
|
|
git -C super config submodule.sub1.URL ../sub &&
|
|
test-tool -C super submodule is-active sub1
|
|
'
|
|
|
|
test_expect_success 'is-active works with submodule.<name>.active config' '
|
|
test_when_finished "git -C super config --unset submodule.sub1.active" &&
|
|
test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
|
|
|
|
git -C super config --bool submodule.sub1.active "false" &&
|
|
test_must_fail test-tool -C super submodule is-active sub1 &&
|
|
|
|
git -C super config --bool submodule.sub1.active "true" &&
|
|
git -C super config --unset submodule.sub1.URL &&
|
|
test-tool -C super submodule is-active sub1
|
|
'
|
|
|
|
test_expect_success 'is-active handles submodule.active config missing a value' '
|
|
cp super/.git/config super/.git/config.orig &&
|
|
test_when_finished mv super/.git/config.orig super/.git/config &&
|
|
|
|
cat >>super/.git/config <<-\EOF &&
|
|
[submodule]
|
|
active
|
|
EOF
|
|
|
|
cat >expect <<-\EOF &&
|
|
error: missing value for '\''submodule.active'\''
|
|
EOF
|
|
test-tool -C super submodule is-active sub1 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'is-active works with basic submodule.active config' '
|
|
test_when_finished "git -C super config submodule.sub1.URL ../sub" &&
|
|
test_when_finished "git -C super config --unset-all submodule.active" &&
|
|
|
|
git -C super config --add submodule.active "." &&
|
|
git -C super config --unset submodule.sub1.URL &&
|
|
|
|
test-tool -C super submodule is-active sub1 &&
|
|
test-tool -C super submodule is-active sub2
|
|
'
|
|
|
|
test_expect_success 'is-active correctly works with paths that are not submodules' '
|
|
test_when_finished "git -C super config --unset-all submodule.active" &&
|
|
|
|
test_must_fail test-tool -C super submodule is-active not-a-submodule &&
|
|
|
|
git -C super config --add submodule.active "." &&
|
|
test_must_fail test-tool -C super submodule is-active not-a-submodule
|
|
'
|
|
|
|
test_expect_success 'is-active works with exclusions in submodule.active config' '
|
|
test_when_finished "git -C super config --unset-all submodule.active" &&
|
|
|
|
git -C super config --add submodule.active "." &&
|
|
git -C super config --add submodule.active ":(exclude)sub1" &&
|
|
|
|
test_must_fail test-tool -C super submodule is-active sub1 &&
|
|
test-tool -C super submodule is-active sub2
|
|
'
|
|
|
|
test_expect_success 'is-active with submodule.active and submodule.<name>.active' '
|
|
test_when_finished "git -C super config --unset-all submodule.active" &&
|
|
test_when_finished "git -C super config --unset submodule.sub1.active" &&
|
|
test_when_finished "git -C super config --unset submodule.sub2.active" &&
|
|
|
|
git -C super config --add submodule.active "sub1" &&
|
|
git -C super config --bool submodule.sub1.active "false" &&
|
|
git -C super config --bool submodule.sub2.active "true" &&
|
|
|
|
test_must_fail test-tool -C super submodule is-active sub1 &&
|
|
test-tool -C super submodule is-active sub2
|
|
'
|
|
|
|
test_expect_success 'is-active, submodule.active and submodule add' '
|
|
test_when_finished "rm -rf super2" &&
|
|
git init super2 &&
|
|
test_commit -C super2 initial &&
|
|
git -C super2 config --add submodule.active "sub*" &&
|
|
|
|
# submodule add should only add submodule.<name>.active
|
|
# to the config if not matched by the pathspec
|
|
git -C super2 submodule add ../sub sub1 &&
|
|
test_must_fail git -C super2 config --get submodule.sub1.active &&
|
|
|
|
git -C super2 submodule add ../sub mod &&
|
|
git -C super2 config --get submodule.mod.active
|
|
'
|
|
|
|
test_done
|