| commit | 1a9a23e35c1ba75187ee600fb7a1f107a2fb1893 | |
| author | John Keeping <john@keeping.me.uk> | |
| Sat, 5 Sep 2015 13:12:45 +0000 (5 14:12 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 8 Sep 2015 17:34:58 +0000 (8 10:34 -0700) | ||
| tree | 6ca7bfbaa7933abb33964ce1d1e439563ed4d5c1 | treesnapshot (tar.gz zip) |
| parent | fb8880dea3111deb4b1134471aa36f99285d86dc | commitdiff |
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>
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>
| t/t7610-mergetool.sh | diffblobblamehistory |