diff options
| author | John Keeping <john@keeping.me.uk> | 2015-09-05 13:12:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-08 17:35:03 (GMT) |
| commit | da568b66f1b481998bee3a2569739ca1302fd65c (patch) | |
| tree | 450d7ce49a8ab3e80f9f9df292e0746d2df0e073 /t/t7800-difftool.sh | |
| parent | 5fafc07fca933be10c82ba97a6fd3b28d6b3a02e (diff) | |
| download | git-da568b66f1b481998bee3a2569739ca1302fd65c.zip git-da568b66f1b481998bee3a2569739ca1302fd65c.tar.gz git-da568b66f1b481998bee3a2569739ca1302fd65c.tar.bz2 | |
t7800: don't use test_config in a subshell
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>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 8 |
1 files 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 |