Signed-off-by: David Aguilar <dav...@gmail.com>
---
This is a replacement patch for
"t7610-mergetool: prefer test_config over git config"
in da/mergetool-tests.
Changes since v1:
The changes are more surgical and the commit message mentions
why we are using test_config.
t/t7610-mergetool.sh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 1a15e06..4fec633 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
'
--
2.1.2.453.g1b015e3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
