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

t7800: don't use test_config in a subshell

Browse Source 
Use the new "-C" option to test_config to change the configuration in
the submodule from the top level of the test so that it can be unset
correctly when the test finishes.

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:48 +01:00 committed by Junio C Hamano
parent 5fafc07fca
commit da568b66f1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
t/t7800-difftool.sh
View File

@ -492,12 +492,12 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' '
test_expect_success PERL 'difftool properly honors gitlink and core.worktree' ' test_expect_success PERL 'difftool properly honors gitlink and core.worktree' '
git submodule add ./. submod/ule && git submodule add ./. submod/ule &&
( test_config -C submod/ule diff.tool checktrees &&
cd submod/ule && test_config -C submod/ule difftool.checktrees.cmd '\''
test_config diff.tool checktrees &&
test_config difftool.checktrees.cmd '\''
test -d "$LOCAL" && test -d "$REMOTE" && echo good test -d "$LOCAL" && test -d "$REMOTE" && echo good
'\'' && '\'' &&
(
cd submod/ule &&
echo good >expect && echo good >expect &&
git difftool --tool=checktrees --dir-diff HEAD~ >actual && git difftool --tool=checktrees --dir-diff HEAD~ >actual &&
test_cmp expect actual test_cmp expect actual