git-p4: test sync new branch

Add two new unit tests.  One to test the feature that that
was added in e32e00d, and another to test the regression
that was fixed in the parent to this commit.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh
index abe7c64ba9ca8442f4c50d15fffeefd6bba02b5f..a523473954a43193e8111beb58027b6734cb664b 100755 (executable)
--- a/t/t9800-git-p4.sh
+++ b/t/t9800-git-p4.sh
@@ -61,6 +61,29 @@ test_expect_success 'git-p4 clone @all' '
        rm -rf "$git" && mkdir "$git"
 '
 
+test_expect_success 'git-p4 sync uninitialized repo' '
+       test_create_repo "$git" &&
+       cd "$git" &&
+       test_must_fail "$GITP4" sync &&
+       rm -rf "$git" && mkdir "$git"
+'
+
+#
+# Create a git repo by hand.  Add a commit so that HEAD is valid.
+# Test imports a new p4 repository into a new git branch.
+#
+test_expect_success 'git-p4 sync new branch' '
+       test_create_repo "$git" &&
+       cd "$git" &&
+       test_commit head &&
+       "$GITP4" sync --branch=refs/remotes/p4/depot //depot@all &&
+       git log --oneline p4/depot >lines &&
+       cat lines &&
+       test_line_count = 2 lines &&
+       cd .. &&
+       rm -rf "$git" && mkdir "$git"
+'
+
 test_expect_success 'exit when p4 fails to produce marshaled output' '
        badp4dir="$TRASH_DIRECTORY/badp4dir" &&
        mkdir -p "$badp4dir" &&