diff options
| author | David Aguilar <davvid@gmail.com> | 2014-10-15 08:35:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-16 19:09:51 (GMT) |
| commit | 688684eba436c021eaddab1725093bb953cf260d (patch) | |
| tree | 27535d6d2dfc27fe19175b7edda2a7d7a4b94c2c /t/t7610-mergetool.sh | |
| parent | 8f0cb41da26c1e20cfbcfded030d6539464b132e (diff) | |
| download | git-688684eba436c021eaddab1725093bb953cf260d.zip git-688684eba436c021eaddab1725093bb953cf260d.tar.gz git-688684eba436c021eaddab1725093bb953cf260d.tar.bz2 | |
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
| -rwxr-xr-x | t/t7610-mergetool.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 2834ded..4fec633 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 |