diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-21 20:28:42 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-21 20:28:42 (GMT) |
| commit | a46af5946c3ec125e0c2fee889610485eb4a6e14 (patch) | |
| tree | 3ed40836fea576ca667c5704412122780437e2c4 /t | |
| parent | e96e98b3399ae4c638466f84068fe94d4712c5a3 (diff) | |
| parent | 688684eba436c021eaddab1725093bb953cf260d (diff) | |
| download | git-a46af5946c3ec125e0c2fee889610485eb4a6e14.zip git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.gz git-a46af5946c3ec125e0c2fee889610485eb4a6e14.tar.bz2 | |
Merge branch 'da/mergetool-temporary-directory'
Allow a temporary directory specified to be used while running "git
mergetool" backend.
* da/mergetool-temporary-directory:
t7610-mergetool: add test cases for mergetool.writeToTemp
mergetool: add an option for writing to a temporary directory
Diffstat (limited to 't')
| -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 3502ec9..7eeb207 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 |