OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
t7610: clean up foo.XXXXXX tmpdir
[git-core/git.git]
/
t
/
t7610-mergetool.sh
diff --git
a/t/t7610-mergetool.sh
b/t/t7610-mergetool.sh
index
7217f39
..
4db24d5
100755
(executable)
--- 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' '