summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2014-10-15 22:30:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-10-16 12:03:21 -0700
commitd7d300ea598b8a192f73cee15c7c3c7fcb556888 (patch)
tree4bce57452b6eb7599835a9a1b85c87a651816f47
parentt7610-mergetool: add missing && and remove commented-out code (diff)
downloadtgif-d7d300ea598b8a192f73cee15c7c3c7fcb556888.tar.xz
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>
-rwxr-xr-xt/t7610-mergetool.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 214edfbcfc..2834ded84d 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -112,7 +112,7 @@ test_expect_success 'custom mergetool' '
'
test_expect_success 'mergetool crlf' '
- git config core.autocrlf true &&
+ test_config core.autocrlf true &&
git checkout -b test2 branch1 &&
test_must_fail git merge master >/dev/null 2>&1 &&
( yes "" | git mergetool file1 >/dev/null 2>&1 ) &&
@@ -505,14 +505,12 @@ test_expect_success 'file with no base' '
test_expect_success 'custom commands override built-ins' '
git checkout -b test14 branch1 &&
- git config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
- git config mergetool.defaults.trustExitCode true &&
+ test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
+ test_config mergetool.defaults.trustExitCode true &&
test_must_fail git merge master &&
git mergetool --no-prompt --tool defaults -- both &&
echo master both added >expected &&
test_cmp both expected &&
- git config --unset mergetool.defaults.cmd &&
- git config --unset mergetool.defaults.trustExitCode &&
git reset --hard master >/dev/null 2>&1
'