kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ak/lazy-prereq-mktemp' into maint 

Test code clean-up.

* ak/lazy-prereq-mktemp:
  t7610: clean up foo.XXXXXX tmpdir
maint
Junio C Hamano 2017-01-17 15:19:04 -08:00
parent 1df2046d27 fa3142c919
commit d0366b137c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t7610-mergetool.sh
View File

@ -591,7 +591,8 @@ test_expect_success 'filenames seen by tools start with ./' '

test_lazy_prereq MKTEMP '
tempdir=$(mktemp -d -t foo.XXXXXX) &&
test -d "$tempdir"
test -d "$tempdir" &&
rmdir "$tempdir"
'

test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '