diff options
| author | John Keeping <john@keeping.me.uk> | 2015-09-05 14:12:45 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-08 10:34:58 -0700 |
| commit | 1a9a23e35c1ba75187ee600fb7a1f107a2fb1893 (patch) | |
| tree | 6ca7bfbaa7933abb33964ce1d1e439563ed4d5c1 /t/t7610-mergetool.sh | |
| parent | fb8880dea3111deb4b1134471aa36f99285d86dc (diff) | |
| download | git-1a9a23e35c1ba75187ee600fb7a1f107a2fb1893.tar.gz | |
t7610: don't use test_config in a subshell
test_config uses test_when_finished to reset the configuration after the
test, but this does not work inside a subshell. This does not cause a
problem here because the first thing the next test does is to set this
config variable itself, but we are about to add a check that will
complain when test_when_finished is used in a subshell.
In this case, "subdir" not a submodule so test_config has the same
effect when run at the top level and can simply be moved out of the
subshell.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 ) && |