X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5400-send-pack.sh;h=6c8767e1df76323f406df56b39d4ba4596e0ab97;hb=e340d7d3fa1c5b9a6e7af2e3ee3d526064e56bea;hp=8afb89971752fe4a91b9b7c62b4b0a6b69a8272b;hpb=f5961572a02ef08324f297fe93b704ff2137e5a6;p=git.git

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 8afb89971..6c8767e1d 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -8,40 +8,65 @@ 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 '
-	tree=$(git-write-tree) &&
-	commit=$(echo "Commit #0" | git-commit-tree $tree) &&
+	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 &&
-	    commit=$(echo "Commit #$i" | git-commit-tree $tree -p $parent) &&
+	    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 update-ref HEAD "$commit" &&
+	git-clone ./. victim &&
 	cd victim &&
-	git-log &&
+	git log &&
 	cd .. &&
-	git-update-ref HEAD "$zero" &&
+	git update-ref HEAD "$zero" &&
 	parent=$zero &&
-	for i in $cnt
+	i=0 &&
+	while test $i -le $cnt
 	do
-	    sleep 1 &&
-	    commit=$(echo "Rebase #$i" | git-commit-tree $tree -p $parent) &&
+	    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" &&
+	git update-ref HEAD "$commit" &&
 	echo Rebase &&
-	git-log'
+	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' ' 
+        'pushing rewound head should not barf but require --force' '
 	# should not fail but refuse to update.
 	if git-send-pack ./victim/.git/ master
 	then
@@ -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,11 +106,11 @@ 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 &&
-	! diff -u .git/refs/heads/master victim/.git/refs/heads/master
+	git update-ref refs/heads/master master^ || return 1
+	git-send-pack --force ./victim/.git/ master && return 1
+	! git diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done