diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 15:19:04 -0800 |
| commit | d0366b137c01ada0fc2cd97a151bc36bc4d30eeb (patch) | |
| tree | 0cade6806903f9909891d3996039b2bc90b816cd /t | |
| parent | 1df2046d270011837c904d2b568b599bf61cdb87 (diff) | |
| parent | fa3142c9193bb31e7154d0f0cd7d15208a8dd51a (diff) | |
| download | git-d0366b137c01ada0fc2cd97a151bc36bc4d30eeb.tar.gz git-d0366b137c01ada0fc2cd97a151bc36bc4d30eeb.tar.xz | |
Merge branch 'ak/lazy-prereq-mktemp' into maint
Test code clean-up.
* ak/lazy-prereq-mktemp:
t7610: clean up foo.XXXXXX tmpdir
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7610-mergetool.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh index 6d9f21511..63d36fb28 100755 --- a/t/t7610-mergetool.sh +++ b/t/t7610-mergetool.sh @@ -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' ' |