Show a failure of rebase -p if the merge had a conflict

diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh
index 59a165a6d44190a1ce9ef9575dc6c8a2ce9f4efb..8dfaaa456e115e85e36c438bb998d8053534104e 100755 (executable)
--- a/t/t5701-clone-local.sh
+++ b/t/t5701-clone-local.sh
@@ -11,6 +11,11 @@ test_expect_success 'preparing origin repository' '
        git clone --bare . x &&
        test "$(GIT_CONFIG=a.git/config git config --bool core.bare)" = true &&
        test "$(GIT_CONFIG=x/config git config --bool core.bare)" = true
+       git bundle create b1.bundle --all HEAD &&
+       git bundle create b2.bundle --all &&
+       mkdir dir &&
+       cp b1.bundle dir/b3
+       cp b1.bundle b4
 '
 
 test_expect_success 'local clone without .git suffix' '
@@ -71,4 +76,44 @@ test_expect_success 'local clone of repo with nonexistent ref in HEAD' '
        git fetch &&
        test ! -e .git/refs/remotes/origin/HEAD'
 
+test_expect_success 'bundle clone without .bundle suffix' '
+       cd "$D" &&
+       git clone dir/b3 &&
+       cd b3 &&
+       git fetch
+'
+
+test_expect_success 'bundle clone with .bundle suffix' '
+       cd "$D" &&
+       git clone b1.bundle &&
+       cd b1 &&
+       git fetch
+'
+
+test_expect_success 'bundle clone from b4' '
+       cd "$D" &&
+       git clone b4 bdl &&
+       cd bdl &&
+       git fetch
+'
+
+test_expect_success 'bundle clone from b4.bundle that does not exist' '
+       cd "$D" &&
+       if git clone b4.bundle bb
+       then
+               echo "Oops, should have failed"
+               false
+       else
+               echo happy
+       fi
+'
+
+test_expect_success 'bundle clone with nonexistent HEAD' '
+       cd "$D" &&
+       git clone b2.bundle b2 &&
+       cd b2 &&
+       git fetch
+       test ! -e .git/refs/heads/master
+'
+
 test_done