X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft5400-send-pack.sh;h=b1c97b0dfb1748a7ba80c18d2d4b84bdee192c95;hb=5339fb2e8b230c2306539ea4927c56c9772ea23d;hp=28744b35e10602cf5076fbf5c62b3e767a847c0c;hpb=2570458fdaeb577eb60e470bee0f7065dd2058b8;p=git.git

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 28744b35e..b1c97b0df 100755
--- 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.
@@ -81,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
+	! diff .git/refs/heads/master victim/.git/refs/heads/master
 '
 
 test_done