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/t7610-mergetool.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/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 7eeb207b32..6f12b235b3 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -174,9 +174,9 @@ test_expect_success 'mergetool skips autoresolved' ' ' test_expect_success 'mergetool merges all from subdir' ' + test_config rerere.enabled false && ( cd subdir && - test_config rerere.enabled false && test_must_fail git merge master && ( yes "r" | git mergetool ../submod ) && ( yes "d" "d" | git mergetool --no-prompt ) && |