Default GIT_MERGE_VERBOSITY to 5 during tests.

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 8afb89971752fe4a91b9b7c62b4b0a6b69a8272b..7d93d0d7c90de94b0972d8fa5cd6d747c3fd2f56 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -8,38 +8,63 @@ test_description='See why rewinding head breaks send-pack
 '
 . ./test-lib.sh
 
-touch cpio-test
-test_expect_success 'working cpio' 'echo cpio-test | cpio -o > /dev/null'
-
-cnt='1'
+cnt=64
 test_expect_success setup '
+       test_tick &&
+       mkdir mozart mozart/is &&
+       echo "Commit #0" >mozart/is/pink &&
+       git-update-index --add mozart/is/pink &&
        tree=$(git-write-tree) &&
        commit=$(echo "Commit #0" | git-commit-tree $tree) &&
        zero=$commit &&
        parent=$zero &&
-       for i in $cnt
+       i=0 &&
+       while test $i -le $cnt
        do
-           sleep 1 &&
+           i=$(($i+1)) &&
+           test_tick &&
+           echo "Commit #$i" >mozart/is/pink &&
+           git-update-index --add mozart/is/pink &&
+           tree=$(git-write-tree) &&
            commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&
+           git-update-ref refs/tags/commit$i $commit &&
            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&
-       git-clone -l ./. victim &&
+       git-clone ./. victim &&
        cd victim &&
        git-log &&
        cd .. &&
        git-update-ref HEAD "$zero" &&
        parent=$zero &&
-       for i in $cnt
+       i=0 &&
+       while test $i -le $cnt
        do
-           sleep 1 &&
+           i=$(($i+1)) &&
+           test_tick &&
+           echo "Rebase #$i" >mozart/is/pink &&
+           git-update-index --add mozart/is/pink &&
+           tree=$(git-write-tree) &&
            commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&
+           git-update-ref refs/tags/rebase$i $commit &&
            parent=$commit || return 1
        done &&
        git-update-ref HEAD "$commit" &&
        echo Rebase &&
        git-log'
 
+test_expect_success 'pack the source repository' '
+       git repack -a -d &&
+       git prune
+'
+
+test_expect_success 'pack the destination repository' '
+       cd victim &&
+       git repack -a -d &&
+       git prune &&
+       cd ..
+'
+
 test_expect_success \
         'pushing rewound head should not barf but require --force' ' 
        # should not fail but refuse to update.
@@ -64,6 +89,16 @@ test_expect_success \
        cmp victim/.git/refs/heads/master .git/refs/heads/master
 '
 
+test_expect_success \
+        'push can be used to delete a ref' '
+       cd victim &&
+       git branch extra master &&
+       cd .. &&
+       test -f victim/.git/refs/heads/extra &&
+       git-send-pack ./victim/.git/ :extra master &&
+       ! test -f victim/.git/refs/heads/extra
+'
+
 unset GIT_CONFIG GIT_CONFIG_LOCAL
 HOME=`pwd`/no-such-directory
 export HOME ;# this way we force the victim/.git/config to be used.
@@ -71,7 +106,7 @@ export HOME ;# this way we force the victim/.git/config to be used.
 test_expect_success \
         'pushing with --force should be denied with denyNonFastforwards' '
        cd victim &&
-       git-repo-config receive.denyNonFastforwards true &&
+       git-config receive.denyNonFastforwards true &&
        cd .. &&
        git-update-ref refs/heads/master master^ &&
        git-send-pack --force ./victim/.git/ master &&