summaryrefslogtreecommitdiff
path: root/t/t6437-submodule-merge.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2021-04-23 05:47:15 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-27 06:15:34 (GMT)
commit482d5499067b2a1fc8d1ebfb5160022dc23ab136 (patch)
tree81ce36e19f0fb858f45398d21edd52664ebe7d1c /t/t6437-submodule-merge.sh
parent4179b4897f2de28858acaebd6382c06c91532e98 (diff)
downloadgit-482d5499067b2a1fc8d1ebfb5160022dc23ab136.zip
git-482d5499067b2a1fc8d1ebfb5160022dc23ab136.tar.gz
git-482d5499067b2a1fc8d1ebfb5160022dc23ab136.tar.bz2
t1300: fix unset of GIT_CONFIG_NOSYSTEM leaking into subsequent tests
In order to test whether the new GIT_CONFIG_SYSTEM environment variable behaves as expected, we unset GIT_CONFIG_NOSYSTEM in one of our tests in t1300. But because tests are not executed in a subshell, this unset leaks into all subsequent tests and may thus cause them to fail in some environments. These failures are easily reproducable with `make prefix=/root test`. Fix the issue by not using `sane_unset GIT_CONFIG_NOSYSTEM`, but instead just manually add it to the environment of the two command invocations which need it. Reported-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6437-submodule-merge.sh')
0 files changed, 0 insertions, 0 deletions