git-clone: split up long &&-command-chain and use a function for cleanup

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 3ce9446210bc56443e7a39273699983c1d9a65a4..426017e1d08aad5aa3a92f9473e02defc4b10aaf 100755 (executable)
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -22,20 +22,22 @@ test_expect_success "clone and setup child repos" '
        cd .. &&
        git clone . two &&
        cd two &&
-       git repo-config branch.master.remote one &&
-       git repo-config remote.one.url ../one/.git/ &&
-       git repo-config remote.one.fetch refs/heads/master:refs/heads/one &&
+       git config branch.master.remote one &&
+       git config remote.one.url ../one/.git/ &&
+       git config remote.one.fetch refs/heads/master:refs/heads/one &&
        cd .. &&
        git clone . three &&
        cd three &&
-       git repo-config branch.master.remote two &&
-       git repo-config branch.master.merge refs/heads/one &&
+       git config branch.master.remote two &&
+       git config branch.master.merge refs/heads/one &&
        mkdir -p .git/remotes &&
        {
                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,66 @@ 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 'header of bundle looks right' '
+       head -n 1 "$D"/bundle1 | grep "^#" &&
+       head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
+       head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
+       head -n 4 "$D"/bundle1 | grep "^$"
+'
+
+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 'bundle 1 has only 3 files ' '
+       cd "$D" &&
+       (
+               while read x && test -n "$x"
+               do
+                       :;
+               done
+               cat
+       ) <bundle1 >bundle.pack &&
+       git index-pack bundle.pack &&
+       verify=$(git verify-pack -v bundle.pack) &&
+       test 4 = $(echo "$verify" | wc -l)
+'
+
+test_expect_success 'unbundle 2' '
+       cd "$D/bundle" &&
+       git fetch ../bundle2 master:master &&
+       test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+'
+
+test_expect_success 'bundle does not prerequisite objects' '
+       cd "$D" &&
+       touch file2 &&
+       git add file2 &&
+       git commit -m add.file2 file2 &&
+       git bundle create bundle3 -1 HEAD &&
+       (
+               while read x && test -n "$x"
+               do
+                       :;
+               done
+               cat
+       ) <bundle3 >bundle.pack &&
+       git index-pack bundle.pack &&
+       test 4 = $(git verify-pack -v bundle.pack | wc -l)
+'
+
 test_done