undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7610: don't use test_config in a subshell

Browse Source 
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 <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
John Keeping 2015-09-05 14:12:45 +01:00 committed by Junio C Hamano
parent fb8880dea3
commit 1a9a23e35c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t7610-mergetool.sh
View File

@ -174,9 +174,9 @@ test_expect_success 'mergetool skips autoresolved' '
' '
test_expect_success 'mergetool merges all from subdir' ' test_expect_success 'mergetool merges all from subdir' '
test_config rerere.enabled false &&
( (
cd subdir && cd subdir &&
test_config rerere.enabled false &&
test_must_fail git merge master && test_must_fail git merge master &&
( yes "r" | git mergetool ../submod ) && ( yes "r" | git mergetool ../submod ) &&
( yes "d" "d" | git mergetool --no-prompt ) && ( yes "d" "d" | git mergetool --no-prompt ) &&