Sync with 1.8.1.1

diff --git a/t/t9804-git-p4-label.sh b/t/t9804-git-p4-label.sh
index a9e04efb889c07037b6800171f9675c8afb68e18..e30f80e617674967b1d474c1485a6570f1ef2903 100755 (executable)
--- 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 &&