Merge branch 'jc/reflog-reverse-walk' into nd/branch-show-rebase-bisect-state

diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 844aae048ec58be1c5dfa8b3561044332c82e3de..4f077eeca86946aa897f15e9f1729f9d0588cfb9 100755 (executable)
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -27,7 +27,7 @@ test_expect_success 'clone no --git-dir' '
        test_must_fail git p4 clone --git-dir=xx //depot
 '
 
-test_expect_failure 'clone --branch should checkout master' '
+test_expect_success 'clone --branch should checkout master' '
        git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
        test_when_finished cleanup_git &&
        (
@@ -40,14 +40,34 @@ test_expect_failure '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 &&
@@ -83,6 +103,29 @@ test_expect_failure 'sync --branch updates specified branch' '
        )
 '
 
+# allows using the refname "p4" as a short name for p4/master
+test_expect_success 'clone creates HEAD symbolic reference' '
+       git p4 clone --dest="$git" //depot &&
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               git rev-parse --verify refs/remotes/p4/master >master &&
+               git rev-parse --verify p4 >p4 &&
+               test_cmp master p4
+       )
+'
+
+test_expect_success 'clone --branch creates HEAD symbolic reference' '
+       git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               git rev-parse --verify refs/remotes/p4/sb >sb &&
+               git rev-parse --verify p4 >p4 &&
+               test_cmp sb p4
+       )
+'
+
 test_expect_success 'clone --changesfile' '
        test_when_finished "rm cf" &&
        printf "1\n3\n" >cf &&
@@ -183,9 +226,11 @@ test_expect_success 'clone --use-client-spec' '
                View: //depot/sub/... //client2/bus/...
                EOF
        ) &&
-       P4CLIENT=client2 &&
        test_when_finished cleanup_git &&
-       git p4 clone --dest="$git" --use-client-spec //depot/... &&
+       (
+               P4CLIENT=client2 &&
+               git p4 clone --dest="$git" --use-client-spec //depot/...
+       ) &&
        (
                cd "$git" &&
                test_path_is_file bus/dir/f4 &&
@@ -198,6 +243,7 @@ test_expect_success 'clone --use-client-spec' '
                cd "$git" &&
                git init &&
                git config git-p4.useClientSpec true &&
+               P4CLIENT=client2 &&
                git p4 sync //depot/... &&
                git checkout -b master p4/master &&
                test_path_is_file bus/dir/f4 &&
@@ -205,6 +251,31 @@ test_expect_success 'clone --use-client-spec' '
        )
 '
 
+test_expect_success 'submit works with no p4/master' '
+       test_when_finished cleanup_git &&
+       git p4 clone --branch=b1 //depot@1,2 --destination="$git" &&
+       (
+               cd "$git" &&
+               test_commit submit-1-branch &&
+               git config git-p4.skipSubmitEdit true &&
+               git p4 submit --branch=b1
+       )
+'
+
+# 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 p4 sync --branch=b2 //depot@1,3 &&
+               test_commit submit-2-branches &&
+               git config git-p4.skipSubmitEdit true &&
+               git p4 submit
+       )
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '