From: David Aguilar Date: Wed, 15 Oct 2014 08:35:19 +0000 (-0700) Subject: t7610-mergetool: add test cases for mergetool.writeToTemp X-Git-Tag: v2.2.0-rc0~28^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/688684eba436c021eaddab1725093bb953cf260d t7610-mergetool: add test cases for mergetool.writeToTemp Add tests to ensure that filenames start with "./" when mergetool.writeToTemp is false and do not start with "./" when mergetool.writeToTemp is true. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 2834ded84d..4fec633f8a 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -514,4 +514,27 @@ test_expect_success 'custom commands override built-ins' ' git reset --hard master >/dev/null 2>&1 ' +test_expect_success 'filenames seen by tools start with ./' ' + git checkout -b test15 branch1 && + test_config mergetool.writeToTemp false && + test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" && + test_config mergetool.myecho.trustExitCode true && + test_must_fail git merge master && + git mergetool --no-prompt --tool myecho -- both >actual && + grep ^\./both_LOCAL_ actual >/dev/null && + git reset --hard master >/dev/null 2>&1 +' + +test_expect_success 'temporary filenames are used with mergetool.writeToTemp' ' + git checkout -b test16 branch1 && + test_config mergetool.writeToTemp true && + test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" && + test_config mergetool.myecho.trustExitCode true && + test_must_fail git merge master && + git mergetool --no-prompt --tool myecho -- both >actual && + test_must_fail grep ^\./both_LOCAL_ actual >/dev/null && + grep /both_LOCAL_ actual >/dev/null && + git reset --hard master >/dev/null 2>&1 +' + test_done