Merge branch 'jc/mergetool-tool-help'

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 0571602129306f89292c482a7dc4858ea08a9867..fa40cc8bb59a4e785681013e1dc676709d808410 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-p4 options'
+test_description='git p4 options'
 
 . ./lib-git-p4.sh
 
@@ -24,11 +24,11 @@ test_expect_success 'init depot' '
 '
 
 test_expect_success 'clone no --git-dir' '
-       test_must_fail "$GITP4" clone --git-dir=xx //depot
+       test_must_fail git p4 clone --git-dir=xx //depot
 '
 
 test_expect_success 'clone --branch' '
-       "$GITP4" clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
+       git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -39,10 +39,9 @@ test_expect_success 'clone --branch' '
 '
 
 test_expect_success 'clone --changesfile' '
-       cf="$TRASH_DIRECTORY/cf" &&
-       test_when_finished "rm \"$cf\"" &&
-       printf "1\n3\n" >"$cf" &&
-       "$GITP4" clone --changesfile="$cf" --dest="$git" //depot &&
+       test_when_finished "rm cf" &&
+       printf "1\n3\n" >cf &&
+       git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -55,17 +54,16 @@ test_expect_success 'clone --changesfile' '
 '
 
 test_expect_success 'clone --changesfile, @all' '
-       cf="$TRASH_DIRECTORY/cf" &&
-       test_when_finished "rm \"$cf\"" &&
-       printf "1\n3\n" >"$cf" &&
-       test_must_fail "$GITP4" clone --changesfile="$cf" --dest="$git" //depot@all
+       test_when_finished "rm cf" &&
+       printf "1\n3\n" >cf &&
+       test_must_fail git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot@all
 '
 
 # imports both master and p4/master in refs/heads
 # requires --import-local on sync to find p4 refs/heads
 # does not update master on sync, just p4/master
 test_expect_success 'clone/sync --import-local' '
-       "$GITP4" clone --import-local --dest="$git" //depot@1,2 &&
+       git p4 clone --import-local --dest="$git" //depot@1,2 &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -73,9 +71,9 @@ test_expect_success 'clone/sync --import-local' '
                test_line_count = 2 lines &&
                git log --oneline refs/heads/p4/master >lines &&
                test_line_count = 2 lines &&
-               test_must_fail "$GITP4" sync &&
+               test_must_fail git p4 sync &&
 
-               "$GITP4" sync --import-local &&
+               git p4 sync --import-local &&
                git log --oneline refs/heads/master >lines &&
                test_line_count = 2 lines &&
                git log --oneline refs/heads/p4/master >lines &&
@@ -84,7 +82,7 @@ test_expect_success 'clone/sync --import-local' '
 '
 
 test_expect_success 'clone --max-changes' '
-       "$GITP4" clone --dest="$git" --max-changes 2 //depot@all &&
+       git p4 clone --dest="$git" --max-changes 2 //depot@all &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -101,7 +99,7 @@ test_expect_success 'clone --keep-path' '
                p4 add sub/dir/f4 &&
                p4 submit -d "change 4"
        ) &&
-       "$GITP4" clone --dest="$git" --keep-path //depot/sub/dir@all &&
+       git p4 clone --dest="$git" --keep-path //depot/sub/dir@all &&
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
@@ -109,7 +107,7 @@ test_expect_success 'clone --keep-path' '
                test_path_is_file sub/dir/f4
        ) &&
        cleanup_git &&
-       "$GITP4" clone --dest="$git" //depot/sub/dir@all &&
+       git p4 clone --dest="$git" //depot/sub/dir@all &&
        (
                cd "$git" &&
                test_path_is_file f4 &&
@@ -126,9 +124,9 @@ test_expect_success 'clone --use-client-spec' '
        (
                # big usage message
                exec >/dev/null &&
-               test_must_fail "$GITP4" clone --dest="$git" --use-client-spec
+               test_must_fail git p4 clone --dest="$git" --use-client-spec
        ) &&
-       cli2="$TRASH_DIRECTORY/cli2" &&
+       cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") &&
        mkdir -p "$cli2" &&
        test_when_finished "rmdir \"$cli2\"" &&
        (
@@ -142,7 +140,7 @@ test_expect_success 'clone --use-client-spec' '
        ) &&
        P4CLIENT=client2 &&
        test_when_finished cleanup_git &&
-       "$GITP4" clone --dest="$git" --use-client-spec //depot/... &&
+       git p4 clone --dest="$git" --use-client-spec //depot/... &&
        (
                cd "$git" &&
                test_path_is_file bus/dir/f4 &&
@@ -151,12 +149,11 @@ 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 &&
                git config git-p4.useClientSpec true &&
-               "$GITP4" sync //depot/... &&
+               git p4 sync //depot/... &&
                git checkout -b master p4/master &&
                test_path_is_file bus/dir/f4 &&
                test_path_is_missing file1