diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:14:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-12-11 11:14:10 -0800 |
| commit | 4cb5488fa6cd1dc3cea253e7d8df6bf9d945653b (patch) | |
| tree | d5e6c90ac3e4223be3efed3e39d930971b367094 /t/t7800-difftool.sh | |
| parent | Documentation/git-update-index: add missing opts to synopsis (diff) | |
| parent | test-lib-functions: detect test_when_finished in subshell (diff) | |
| download | tgif-4cb5488fa6cd1dc3cea253e7d8df6bf9d945653b.tar.xz | |
Merge branch 'jk/test-lint-forbid-when-finished-in-subshell' into maint
Because "test_when_finished" in our test framework queues the
clean-up tasks to be done in a shell variable, it should not be
used inside a subshell. Add a mechanism to allow 'bash' to catch
such uses, and fix the ones that were found.
* jk/test-lint-forbid-when-finished-in-subshell:
test-lib-functions: detect test_when_finished in subshell
t7800: don't use test_config in a subshell
test-lib-functions: support "test_config -C <dir> ..."
t5801: don't use test_when_finished in a subshell
t7610: don't use test_config in a subshell
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 a771cf77f5..ec8bc8c765 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 |