From: John Keeping Date: Sat, 5 Sep 2015 13:12:45 +0000 (+0100) Subject: t7610: don't use test_config in a subshell X-Git-Tag: v2.7.0-rc0~138^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a9a23e35c1ba75187ee600fb7a1f107a2fb1893;p=thirdparty%2Fgit.git t7610: don't use test_config in a subshell test_config uses test_when_finished to reset the configuration after the test, but this does not work inside a subshell. This does not cause a problem here because the first thing the next test does is to set this config variable itself, but we are about to add a check that will complain when test_when_finished is used in a subshell. In this case, "subdir" not a submodule so test_config has the same effect when run at the top level and can simply be moved out of the subshell. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano --- diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 7eeb207b32..6f12b235b3 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -174,9 +174,9 @@ test_expect_success 'mergetool skips autoresolved' ' ' test_expect_success 'mergetool merges all from subdir' ' + test_config rerere.enabled false && ( cd subdir && - test_config rerere.enabled false && test_must_fail git merge master && ( yes "r" | git mergetool ../submod ) && ( yes "d" "d" | git mergetool --no-prompt ) &&