mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
7f732c632f
Relying on eye-candy progress bar was fragile to begin with. Run fetch-pack with -k option, and count the objects that are in the pack that were transferred from the other end. Signed-off-by: Junio C Hamano <junkio@cox.net>
131 lines
2.6 KiB
Bash
Executable file
131 lines
2.6 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
#
|
|
|
|
test_description='Testing multi_ack pack fetching
|
|
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
# Test fetch-pack/upload-pack pair.
|
|
|
|
# Some convenience functions
|
|
|
|
function add () {
|
|
local name=$1
|
|
local text="$@"
|
|
local branch=${name:0:1}
|
|
local parents=""
|
|
|
|
shift
|
|
while test $1; do
|
|
parents="$parents -p $1"
|
|
shift
|
|
done
|
|
|
|
echo "$text" > test.txt
|
|
git-update-index --add test.txt
|
|
tree=$(git-write-tree)
|
|
# make sure timestamps are in correct order
|
|
sec=$(($sec+1))
|
|
commit=$(echo "$text" | GIT_AUTHOR_DATE=$sec \
|
|
git-commit-tree $tree $parents 2>>log2.txt)
|
|
export $name=$commit
|
|
echo $commit > .git/refs/heads/$branch
|
|
eval ${branch}TIP=$commit
|
|
}
|
|
|
|
function count_objects () {
|
|
ls .git/objects/??/* 2>>log2.txt | wc -l | tr -d " "
|
|
}
|
|
|
|
function test_expect_object_count () {
|
|
local message=$1
|
|
local count=$2
|
|
|
|
output="$(count_objects)"
|
|
test_expect_success \
|
|
"new object count $message" \
|
|
"test $count = $output"
|
|
}
|
|
|
|
function pull_to_client () {
|
|
local number=$1
|
|
local heads=$2
|
|
local count=$3
|
|
local no_strict_count_check=$4
|
|
|
|
cd client
|
|
test_expect_success "$number pull" \
|
|
"git-fetch-pack -k -v .. $heads"
|
|
case "$heads" in *A*) echo $ATIP > .git/refs/heads/A;; esac
|
|
case "$heads" in *B*) echo $BTIP > .git/refs/heads/B;; esac
|
|
git-symbolic-ref HEAD refs/heads/${heads:0:1}
|
|
|
|
test_expect_success "fsck" 'git-fsck-objects --full > fsck.txt 2>&1'
|
|
|
|
test_expect_success 'check downloaded results' \
|
|
'mv .git/objects/pack/pack-* . &&
|
|
p=`ls -1 pack-*.pack` &&
|
|
git-unpack-objects <$p &&
|
|
git-fsck-objects --full'
|
|
|
|
test_expect_success "new object count after $number pull" \
|
|
'idx=`echo pack-*.idx` &&
|
|
pack_count=`git-show-index <$idx | wc -l` &&
|
|
test $pack_count = $count'
|
|
test -z "$pack_count" && pack_count=0
|
|
if [ -z "$no_strict_count_check" ]; then
|
|
test_expect_success "minimal count" "test $count = $pack_count"
|
|
else
|
|
test $count != $pack_count && \
|
|
echo "WARNING: $pack_count objects transmitted, only $count of which were needed"
|
|
fi
|
|
rm -f pack-*
|
|
cd ..
|
|
}
|
|
|
|
# Here begins the actual testing
|
|
|
|
# A1 - ... - A20 - A21
|
|
# \
|
|
# B1 - B2 - .. - B70
|
|
|
|
# client pulls A20, B1. Then tracks only B. Then pulls A.
|
|
|
|
(
|
|
mkdir client &&
|
|
cd client &&
|
|
git-init-db 2>> log2.txt
|
|
)
|
|
|
|
add A1
|
|
|
|
prev=1; cur=2; while [ $cur -le 10 ]; do
|
|
add A$cur $(eval echo \$A$prev)
|
|
prev=$cur
|
|
cur=$(($cur+1))
|
|
done
|
|
|
|
add B1 $A1
|
|
|
|
echo $ATIP > .git/refs/heads/A
|
|
echo $BTIP > .git/refs/heads/B
|
|
git-symbolic-ref HEAD refs/heads/B
|
|
|
|
pull_to_client 1st "B A" $((11*3))
|
|
|
|
add A11 $A10
|
|
|
|
prev=1; cur=2; while [ $cur -le 65 ]; do
|
|
add B$cur $(eval echo \$B$prev)
|
|
prev=$cur
|
|
cur=$(($cur+1))
|
|
done
|
|
|
|
pull_to_client 2nd "B" $((64*3))
|
|
|
|
pull_to_client 3rd "A" $((1*3)) # old fails
|
|
|
|
test_done
|