summaryrefslogtreecommitdiff
path: root/t/t9804-git-p4-label.sh
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-04-09 00:18:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-09 22:00:33 (GMT)
commit6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1 (patch)
tree7186f5babb7ccf2713c9baf24fa897204c654d27 /t/t9804-git-p4-label.sh
parent9dcb9f24f8f97c5d0d3224791506161dfeac5a69 (diff)
downloadgit-6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1.zip
git-6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1.tar.gz
git-6ab1d76c3cf96aac77a75565dfaa0cf64aa100a1.tar.bz2
git p4: use "git p4" directly in tests
Drop the $GITP4 variable that was used to specify the script in contrib/fast-import/. The command is called "git p4" now, not "git-p4". Note that configuration variables will remain in a section called "git-p4". Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9804-git-p4-label.sh')
-rwxr-xr-xt/t9804-git-p4-label.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9804-git-p4-label.sh b/t/t9804-git-p4-label.sh
index a9e04ef..e30f80e 100755
--- a/t/t9804-git-p4-label.sh
+++ b/t/t9804-git-p4-label.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='git-p4 p4 label tests'
+test_description='git p4 label tests'
. ./lib-git-p4.sh
@@ -50,7 +50,7 @@ test_expect_success 'basic p4 labels' '
p4 labels ... &&
- "$GITP4" clone --dest="$git" --detect-labels //depot@all &&
+ git p4 clone --dest="$git" --detect-labels //depot@all &&
cd "$git" &&
git tag &&
@@ -89,7 +89,7 @@ test_expect_failure 'two labels on the same changelist' '
p4 labels ... &&
- "$GITP4" clone --dest="$git" --detect-labels //depot@all &&
+ git p4 clone --dest="$git" --detect-labels //depot@all &&
cd "$git" &&
git tag | grep tag_f1 &&