t7610-mergetool: use test_config to isolate tests
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
David Aguilar committed
Oct 15, 2014 at 22:30 UTC
d7d300ea598b8a192f73cee15c7c3c7fcb556888
1 file changed
+3
-5
t/t7610-mergetool.sh
+3
-5
@@ -112,7 +112,7 @@ test_expect_success 'custom mergetool' '
112
'
113
114
test_expect_success 'mergetool crlf' '
115
- git config core.autocrlf true &&
115
+ test_config core.autocrlf true &&
116
git checkout -b test2 branch1 &&
117
test_must_fail git merge master >/dev/null 2>&1 &&
118
( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
@@ -505,14 +505,12 @@ test_expect_success 'file with no base' '
505
506
test_expect_success 'custom commands override built-ins' '
507
git checkout -b test14 branch1 &&
508
- git config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
509
- git config mergetool.defaults.trustExitCode true &&
508
+ test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
509
+ test_config mergetool.defaults.trustExitCode true &&
510
test_must_fail git merge master &&
511
git mergetool --no-prompt --tool defaults -- both &&
512
echo master both added >expected &&
513
test_cmp both expected &&
514
- git config --unset mergetool.defaults.cmd &&
515
- git config --unset mergetool.defaults.trustExitCode &&
514
git reset --hard master >/dev/null 2>&1
515
'
516