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>
This commit is contained in:
Pete Wyckoff 2012-06-27 08:01:01 -04:00 committed by Junio C Hamano
parent f69b3a93ca
commit 23a2666c2e
3 changed files with 3 additions and 2 deletions

View file

@ -99,5 +99,6 @@ kill_p4d() {
} }
cleanup_git() { cleanup_git() {
rm -rf "$git" rm -rf "$git" &&
mkdir "$git"
} }

View file

@ -270,6 +270,7 @@ test_expect_success 'wildcard files submit back to p4, delete' '
' '
test_expect_success 'clone bare' ' test_expect_success 'clone bare' '
rm -rf "$git" &&
git p4 clone --dest="$git" --bare //depot && git p4 clone --dest="$git" --bare //depot &&
test_when_finished cleanup_git && test_when_finished cleanup_git &&
( (

View file

@ -149,7 +149,6 @@ test_expect_success 'clone --use-client-spec' '
cleanup_git && cleanup_git &&
# same thing again, this time with variable instead of option # same thing again, this time with variable instead of option
mkdir "$git" &&
( (
cd "$git" && cd "$git" &&
git init && git init &&