git p4 test: cleanup_git should make a new $git
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 <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Pete Wyckoff committed
Jun 27, 2012 at 08:01 UTC
23a2666c2e402b2425a6abe910c04cebbea25e31
3 files changed
+3
-2
t/lib-git-p4.sh
+2
-1
@@ -99,5 +99,6 @@ kill_p4d() {
99
}
100
101
cleanup_git() {
102
- rm -rf "$git"
102
+ rm -rf "$git" &&
103
+ mkdir "$git"
104
}
t/t9800-git-p4-basic.sh
+1
@@ -270,6 +270,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
270
'
271
272
test_expect_success 'clone bare' '
273
+ rm -rf "$git" &&
274
git p4 clone --dest="$git" --bare //depot &&
275
test_when_finished cleanup_git &&
276
(
t/t9806-git-p4-options.sh
-1
@@ -149,7 +149,6 @@ test_expect_success 'clone --use-client-spec' '
149
cleanup_git &&
150
151
# same thing again, this time with variable instead of option
152
- mkdir "$git" &&
152
(
153
cd "$git" &&
154
git init &&