Merge branch 'ef/non-ascii-parse-options-error-diag'

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 2ad3a3e0ca21c467e400536165a324d309ec66d0..254d428b73fe4983298f57e0d87405002abdfbc2 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -40,14 +40,34 @@ test_expect_success 'clone --branch should checkout master' '
        )
 '
 
-test_expect_failure 'sync when branch is not called master should work' '
+test_expect_success 'sync when no master branch prints a nice error' '
+       test_when_finished cleanup_git &&
        git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot@2 &&
+       (
+               cd "$git" &&
+               test_must_fail git p4 sync 2>err &&
+               grep "Error: no branch refs/remotes/p4/master" err
+       )
+'
+
+test_expect_success 'sync --branch builds the full ref name correctly' '
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
-               git p4 sync &&
-               git show -s --format=%s refs/remotes/p4/sb >show &&
-               grep "change 3" show
+               git init &&
+
+               git p4 sync --branch=b1 //depot &&
+               git rev-parse --verify refs/remotes/p4/b1 &&
+               git p4 sync --branch=p4/b2 //depot &&
+               git rev-parse --verify refs/remotes/p4/b2 &&
+
+               git p4 sync --import-local --branch=h1 //depot &&
+               git rev-parse --verify refs/heads/p4/h1 &&
+               git p4 sync --import-local --branch=p4/h2 //depot &&
+               git rev-parse --verify refs/heads/p4/h2 &&
+
+               git p4 sync --branch=refs/stuff //depot &&
+               git rev-parse --verify refs/stuff
        )
 '
 
@@ -68,14 +88,14 @@ test_expect_success 'sync when two branches but no master should noop' '
        )
 '
 
-test_expect_failure 'sync --branch updates specified branch' '
+test_expect_success 'sync --branch updates specific branch, no detection' '
        test_when_finished cleanup_git &&
        (
                cd "$git" &&
                git init &&
-               git p4 sync --branch=refs/remotes/p4/b1 //depot@2 &&
-               git p4 sync --branch=refs/remotes/p4/b2 //depot@2 &&
-               git p4 sync --branch=refs/remotes/p4/b2 &&
+               git p4 sync --branch=b1 //depot@2 &&
+               git p4 sync --branch=b2 //depot@2 &&
+               git p4 sync --branch=b2 &&
                git show -s --format=%s refs/remotes/p4/b1 >show &&
                grep "Initial import" show &&
                git show -s --format=%s refs/remotes/p4/b2 >show &&
@@ -194,37 +214,58 @@ test_expect_success 'clone --use-client-spec' '
                exec >/dev/null &&
                test_must_fail git p4 clone --dest="$git" --use-client-spec
        ) &&
-       cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") &&
+       # build a different client
+       cli2="$TRASH_DIRECTORY/cli2" &&
        mkdir -p "$cli2" &&
        test_when_finished "rmdir \"$cli2\"" &&
+       test_when_finished cleanup_git &&
        (
-               cd "$cli2" &&
-               p4 client -i <<-EOF
-               Client: client2
-               Description: client2
-               Root: $cli2
-               View: //depot/sub/... //client2/bus/...
-               EOF
-       ) &&
-       P4CLIENT=client2 &&
+               # group P4CLIENT and cli changes in a sub-shell
+               P4CLIENT=client2 &&
+               cli="$cli2" &&
+               client_view "//depot/sub/... //client2/bus/..." &&
+               git p4 clone --dest="$git" --use-client-spec //depot/... &&
+               (
+                       cd "$git" &&
+                       test_path_is_file bus/dir/f4 &&
+                       test_path_is_missing file1
+               ) &&
+               cleanup_git &&
+               # same thing again, this time with variable instead of option
+               (
+                       cd "$git" &&
+                       git init &&
+                       git config git-p4.useClientSpec true &&
+                       git p4 sync //depot/... &&
+                       git checkout -b master p4/master &&
+                       test_path_is_file bus/dir/f4 &&
+                       test_path_is_missing file1
+               )
+       )
+'
+
+test_expect_success 'submit works with no p4/master' '
        test_when_finished cleanup_git &&
-       git p4 clone --dest="$git" --use-client-spec //depot/... &&
+       git p4 clone --branch=b1 //depot@1,2 --destination="$git" &&
        (
                cd "$git" &&
-               test_path_is_file bus/dir/f4 &&
-               test_path_is_missing file1
-       ) &&
-       cleanup_git &&
+               test_commit submit-1-branch &&
+               git config git-p4.skipSubmitEdit true &&
+               git p4 submit --branch=b1
+       )
+'
 
-       # same thing again, this time with variable instead of option
+# The sync/rebase part post-submit will engage detect-branches
+# machinery which will not do anything in this particular test.
+test_expect_success 'submit works with two branches' '
+       test_when_finished cleanup_git &&
+       git p4 clone --branch=b1 //depot@1,2 --destination="$git" &&
        (
                cd "$git" &&
-               git init &&
-               git config git-p4.useClientSpec true &&
-               git p4 sync //depot/... &&
-               git checkout -b master p4/master &&
-               test_path_is_file bus/dir/f4 &&
-               test_path_is_missing file1
+               git p4 sync --branch=b2 //depot@1,3 &&
+               test_commit submit-2-branches &&
+               git config git-p4.skipSubmitEdit true &&
+               git p4 submit
        )
 '