]> git.ipfire.org Git - thirdparty/git.git/commit - t/t7610-mergetool.sh
t7610: test for mktemp before test execution
authorArmin Kunaschik <megabreit@googlemail.com>
Sat, 2 Jul 2016 19:01:51 +0000 (21:01 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 19:18:09 +0000 (12:18 -0700)
commitc578a09bd6310157ea69bb1d2ec2d3d2cc58c85a
treec4ae88302c134528606c264fe974076632e704fa
parent2ff7dff01e620dc87144e076d5bb7e866377df6a
t7610: test for mktemp before test execution

mktemp is not available on all platforms, so the test
'temporary filenames are used with mergetool.writeToTemp'
fails there.
This patch does not replace mktemp but just disables
the test that otherwise would fail.
mergetool checks itself before executing mktemp and
reports an error.

Signed-off-by: Armin Kunaschik <megabreit@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7610-mergetool.sh