[PATCH 4/5] t7800: don't use test_config in a subshell
- From
John Keeping <john@keeping.me.uk>
- Date
- Sep 5, 2015, 13:12 UTC
- Message-ID
- <5aa306f56f544de4f71be98f66b912b72336835f.1441458341.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1441458341.git.john@keeping.me.uk>
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> --- t/t7800-difftool.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ea35a02..48c6e2b 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -492,12 +492,12 @@ test_expect_success PERL 'difftool --no-symlinks detects conflict ' ' test_expect_success PERL 'difftool properly honors gitlink and core.worktree' ' git submodule add ./. submod/ule && + test_config -C submod/ule diff.tool checktrees && + test_config -C submod/ule difftool.checktrees.cmd '\'' + test -d "$LOCAL" && test -d "$REMOTE" && echo good + '\'' && ( cd submod/ule && - test_config diff.tool checktrees && - test_config difftool.checktrees.cmd '\'' - test -d "$LOCAL" && test -d "$REMOTE" && echo good - '\'' && echo good >expect && git difftool --tool=checktrees --dir-diff HEAD~ >actual && test_cmp expect actual
-- 2.5.0.466.g9af26fa