t/t5515-fetch-merge-logic.sh: Add two more tests

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 50c64856f0fd35fd14007e0603a1cf58ce702cec..fa76662dce3dd45cf9d59f57a151c7ab209d4014 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -35,7 +35,9 @@ test_expect_success "clone and setup child repos" '
                echo "URL: ../two/.git/"
                echo "Pull: refs/heads/master:refs/heads/two"
                echo "Pull: refs/heads/one:refs/heads/one"
-       } >.git/remotes/two
+       } >.git/remotes/two &&
+       cd .. &&
+       git clone . bundle
 '
 
 test_expect_success "fetch test" '
@@ -81,4 +83,28 @@ test_expect_success 'fetch following tags' '
 
 '
 
+test_expect_success 'create bundle 1' '
+       cd "$D" &&
+       echo >file updated again by origin &&
+       git commit -a -m "tip" &&
+       git bundle create bundle1 master^..master
+'
+
+test_expect_success 'create bundle 2' '
+       cd "$D" &&
+       git bundle create bundle2 master~2..master
+'
+
+test_expect_failure 'unbundle 1' '
+       cd "$D/bundle" &&
+       git checkout -b some-branch &&
+       git fetch "$D/bundle1" master:master
+'
+
+test_expect_success 'unbundle 2' '
+       cd "$D/bundle" &&
+       git fetch ../bundle2 master:master &&
+       test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+'
+
 test_done