Skip to content

Commit

Permalink
t7800: don't use test_config in a subshell
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
John Keeping authored and Junio C Hamano committed Sep 8, 2015
1 parent 5fafc07 commit da568b6
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions t/t7800-difftool.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit da568b6

Please sign in to comment.