push tests: assert re-pushing annotated tags

diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 3b3ae1f59a4d354472ce5042aa192313324cc516..ce7cb22ad37165c6976b4484f6b39a49747d4485 100755 (executable)
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -84,7 +84,7 @@ p4_add_file() {
        (cd "$cli" &&
                >$1 &&
                p4 add $1 &&
-               p4 submit -d "Added a file" $1
+               p4 submit -d "Added file $1" $1
        )
 }
 
@@ -112,6 +112,40 @@ test_expect_success 'Syncing files' '
        )
 '
 
+# Handling of multiple depot paths:
+#    git p4 clone //depot/pathA //depot/pathB
+#
+test_expect_success 'Create a repo with multiple depot paths' '
+       client_view "//depot/pathA/... //client/pathA/..." \
+                   "//depot/pathB/... //client/pathB/..." &&
+       mkdir -p "$cli/pathA" "$cli/pathB" &&
+       for p in pathA pathB
+       do
+               for i in $(test_seq 1 10)
+               do
+                       p4_add_file "$p/file$p$i"
+               done
+       done
+'
+
+test_expect_success 'Clone repo with multiple depot paths' '
+       test_when_finished cleanup_git &&
+       (
+               cd "$git" &&
+               git p4 clone --changes-block-size=4 //depot/pathA@all //depot/pathB@all \
+                       --destination=dest &&
+               ls -1 dest >log &&
+               test_line_count = 20 log
+       )
+'
+
+test_expect_success 'Clone repo with self-sizing block size' '
+       test_when_finished cleanup_git &&
+       git p4 clone --changes-block-size=1000000 //depot@all --destination="$git" &&
+       git -C "$git" log --oneline >log &&
+       test_line_count \> 10 log
+'
+
 test_expect_success 'kill p4d' '
        kill_p4d
 '