git p4 test: cleanup_git should make a new $git

Pete Wyckoff · gitster · commit 23a2666c2e40 · 2012-06-27T21:06:35.000-07:00
For convenience, leave one in place at the end of each
test so that it is not necessary to build a new one.  This
makes it consistent with $cli.

Signed-off-by: Pete Wyckoff &lt;pw@padd.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
@@ -99,5 +99,6 @@ kill_p4d() {
 }
 
 cleanup_git() {
-	rm -rf "$git"
+	rm -rf "$git" &&
+	mkdir "$git"
 }
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
@@ -270,6 +270,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
 '
 
 test_expect_success 'clone bare' '
+	rm -rf "$git" &&
 	git p4 clone --dest="$git" --bare //depot &&
 	test_when_finished cleanup_git &&
 	(
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
@@ -149,7 +149,6 @@ test_expect_success 'clone --use-client-spec' '
 	cleanup_git &&
 
 	# same thing again, this time with variable instead of option
-	mkdir "$git" &&
 	(
 		cd "$git" &&
 		git init &&

Original file line number	Diff line number	Diff line change
`@@ -99,5 +99,6 @@ kill_p4d() {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`cleanup_git() {`
`102`		`- rm -rf "$git"`
	`102`	`+ rm -rf "$git" &&`
	`103`	`+ mkdir "$git"`
`103`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '`
`270`	`270`	`'`
`271`	`271`
`272`	`272`	`test_expect_success 'clone bare' '`
	`273`	`+ rm -rf "$git" &&`
`273`	`274`	`git p4 clone --dest="$git" --bare //depot &&`
`274`	`275`	`test_when_finished cleanup_git &&`
`275`	`276`	`(`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,6 @@ test_expect_success 'clone --use-client-spec' '`
`149`	`149`	`cleanup_git &&`
`150`	`150`
`151`	`151`	`# same thing again, this time with variable instead of option`
`152`		`- mkdir "$git" &&`
`153`	`152`	`(`
`154`	`153`	`cd "$git" &&`
`155`	`154`	`git init &&`