diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-17 00:27:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-17 00:27:49 +0100 |
| commit | eb600866c3bb7b9b659d4776c1d3283963e93f1a (patch) | |
| tree | ccd3aee96e940224e40fa30988e78aa40998d1cf | |
| parent | Merge branch 'nd/worktree-list-fixup' (diff) | |
| parent | t7610: clean up foo.XXXXXX tmpdir (diff) | |
| download | git-eb600866c3bb7b9b659d4776c1d3283963e93f1a.tar.xz git-eb600866c3bb7b9b659d4776c1d3283963e93f1a.zip | |
Merge branch 'ak/lazy-prereq-mktemp'
Test code clean-up.
* ak/lazy-prereq-mktemp:
t7610: clean up foo.XXXXXX tmpdir
| -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 6d9f21511f..63d36fb28e 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' ' |