built-in rebase --autostash: leave the current branch alone if possible

diff --git a/t/t9818-git-p4-block.sh b/t/t9818-git-p4-block.sh
index 8840a183acfa907eb4659aa5b47ec5bcfbc10e61..ce7cb22ad37165c6976b4484f6b39a49747d4485 100755 (executable)
--- a/t/t9818-git-p4-block.sh
+++ b/t/t9818-git-p4-block.sh
@@ -129,6 +129,7 @@ test_expect_success 'Create a repo with multiple depot paths' '
 '
 
 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 \
@@ -138,6 +139,13 @@ test_expect_success 'Clone repo with multiple depot paths' '
        )
 '
 
+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
 '