mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'ak/lazy-prereq-mktemp' into maint
A test that unconditionally used "mktemp" learned that the command is not necessarily available everywhere. * ak/lazy-prereq-mktemp: t7610: test for mktemp before test execution
This commit is contained in:
commit
1ecc6b291c
|
@ -589,7 +589,12 @@ test_expect_success 'filenames seen by tools start with ./' '
|
|||
git reset --hard master >/dev/null 2>&1
|
||||
'
|
||||
|
||||
test_expect_success 'temporary filenames are used with mergetool.writeToTemp' '
|
||||
test_lazy_prereq MKTEMP '
|
||||
tempdir=$(mktemp -d -t foo.XXXXXX) &&
|
||||
test -d "$tempdir"
|
||||
'
|
||||
|
||||
test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '
|
||||
git checkout -b test16 branch1 &&
|
||||
test_config mergetool.writeToTemp true &&
|
||||
test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
|
||||
|
|
Loading…
Reference in a new issue