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

gitster · gitster · commit d0366b137c01 · 2017-01-17T15:19:04.000-08:00
Test code clean-up.

* ak/lazy-prereq-mktemp:
  t7610: clean up foo.XXXXXX tmpdir
diff --git 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' '

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,8 @@ test_expect_success 'filenames seen by tools start with ./' '`
`591`	`591`
`592`	`592`	`test_lazy_prereq MKTEMP '`
`593`	`593`	`tempdir=$(mktemp -d -t foo.XXXXXX) &&`
`594`		`- test -d "$tempdir"`
	`594`	`+ test -d "$tempdir" &&`
	`595`	`+ rmdir "$tempdir"`
`595`	`596`	`'`
`596`	`597`
`597`	`598`	`test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToTemp' '`