Browse Source
* sp/fetch-optim: Teach git-fetch to exploit server side automatic tag following Teach fetch-pack/upload-pack about --include-tag git-pack-objects: Automatically pack annotated tags if object was packed Teach git-fetch to grab a tag at the same time as a commit Make git-fetch follow tags we already have objects for sooner Teach upload-pack to log the received need lines to an fd Free the path_lists used to find non-local tags in git-fetch Allow builtin-fetch's find_non_local_tags to append onto a list Ensure tail pointer gets setup correctly when we fetch HEAD only Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch Remove unused variable in builtin-fetch find_non_local_tagsmaint
Junio C Hamano
17 years ago
11 changed files with 338 additions and 24 deletions
@ -0,0 +1,84 @@
@@ -0,0 +1,84 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='git-pack-object --include-tag' |
||||
. ./test-lib.sh |
||||
|
||||
TRASH=`pwd` |
||||
|
||||
test_expect_success setup ' |
||||
echo c >d && |
||||
git update-index --add d && |
||||
tree=`git write-tree` && |
||||
commit=`git commit-tree $tree </dev/null` && |
||||
echo "object $commit" >sig && |
||||
echo "type commit" >>sig && |
||||
echo "tag mytag" >>sig && |
||||
echo "tagger $(git var GIT_COMMITTER_IDENT)" >>sig && |
||||
echo >>sig && |
||||
echo "our test tag" >>sig && |
||||
tag=`git mktag <sig` && |
||||
rm d sig && |
||||
git update-ref refs/tags/mytag $tag && { |
||||
echo $tree && |
||||
echo $commit && |
||||
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/" |
||||
} >obj-list |
||||
' |
||||
|
||||
rm -rf clone.git |
||||
test_expect_success 'pack without --include-tag' ' |
||||
packname_1=$(git pack-objects \ |
||||
--window=0 \ |
||||
test-1 <obj-list) |
||||
' |
||||
|
||||
test_expect_success 'unpack objects' ' |
||||
( |
||||
GIT_DIR=clone.git && |
||||
export GIT_DIR && |
||||
git init && |
||||
git unpack-objects -n <test-1-${packname_1}.pack && |
||||
git unpack-objects <test-1-${packname_1}.pack |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'check unpacked result (have commit, no tag)' ' |
||||
git rev-list --objects $commit >list.expect && |
||||
( |
||||
GIT_DIR=clone.git && |
||||
export GIT_DIR && |
||||
test_must_fail git cat-file -e $tag && |
||||
git rev-list --objects $commit |
||||
) >list.actual && |
||||
git diff list.expect list.actual |
||||
' |
||||
|
||||
rm -rf clone.git |
||||
test_expect_success 'pack with --include-tag' ' |
||||
packname_1=$(git pack-objects \ |
||||
--window=0 \ |
||||
--include-tag \ |
||||
test-2 <obj-list) |
||||
' |
||||
|
||||
test_expect_success 'unpack objects' ' |
||||
( |
||||
GIT_DIR=clone.git && |
||||
export GIT_DIR && |
||||
git init && |
||||
git unpack-objects -n <test-2-${packname_1}.pack && |
||||
git unpack-objects <test-2-${packname_1}.pack |
||||
) |
||||
' |
||||
|
||||
test_expect_success 'check unpacked result (have commit, have tag)' ' |
||||
git rev-list --objects mytag >list.expect && |
||||
( |
||||
GIT_DIR=clone.git && |
||||
export GIT_DIR && |
||||
git rev-list --objects $tag |
||||
) >list.actual && |
||||
git diff list.expect list.actual |
||||
' |
||||
|
||||
test_done |
||||
@ -0,0 +1,150 @@
@@ -0,0 +1,150 @@
|
||||
#!/bin/sh |
||||
|
||||
test_description='test automatic tag following' |
||||
|
||||
. ./test-lib.sh |
||||
|
||||
# End state of the repository: |
||||
# |
||||
# T - tag1 S - tag2 |
||||
# / / |
||||
# L - A ------ O ------ B |
||||
# \ \ \ |
||||
# \ C - origin/cat \ |
||||
# origin/master master |
||||
|
||||
test_expect_success setup ' |
||||
test_tick && |
||||
echo ichi >file && |
||||
git add file && |
||||
git commit -m L && |
||||
L=$(git rev-parse --verify HEAD) && |
||||
|
||||
( |
||||
mkdir cloned && |
||||
cd cloned && |
||||
git init-db && |
||||
git remote add -f origin .. |
||||
) && |
||||
|
||||
test_tick && |
||||
echo A >file && |
||||
git add file && |
||||
git commit -m A && |
||||
A=$(git rev-parse --verify HEAD) |
||||
' |
||||
|
||||
U=UPLOAD_LOG |
||||
|
||||
cat - <<EOF >expect |
||||
#S |
||||
want $A |
||||
#E |
||||
EOF |
||||
test_expect_success 'fetch A (new commit : 1 connection)' ' |
||||
rm -f $U |
||||
( |
||||
cd cloned && |
||||
GIT_DEBUG_SEND_PACK=3 git fetch 3>../$U && |
||||
test $A = $(git rev-parse --verify origin/master) |
||||
) && |
||||
test -s $U && |
||||
cut -d" " -f1,2 $U >actual && |
||||
git diff expect actual |
||||
' |
||||
|
||||
test_expect_success "create tag T on A, create C on branch cat" ' |
||||
git tag -a -m tag1 tag1 $A && |
||||
T=$(git rev-parse --verify tag1) && |
||||
|
||||
git checkout -b cat && |
||||
echo C >file && |
||||
git add file && |
||||
git commit -m C && |
||||
C=$(git rev-parse --verify HEAD) && |
||||
git checkout master |
||||
' |
||||
|
||||
cat - <<EOF >expect |
||||
#S |
||||
want $C |
||||
want $T |
||||
#E |
||||
EOF |
||||
test_expect_success 'fetch C, T (new branch, tag : 1 connection)' ' |
||||
rm -f $U |
||||
( |
||||
cd cloned && |
||||
GIT_DEBUG_SEND_PACK=3 git fetch 3>../$U && |
||||
test $C = $(git rev-parse --verify origin/cat) && |
||||
test $T = $(git rev-parse --verify tag1) && |
||||
test $A = $(git rev-parse --verify tag1^0) |
||||
) && |
||||
test -s $U && |
||||
cut -d" " -f1,2 $U >actual && |
||||
git diff expect actual |
||||
' |
||||
|
||||
test_expect_success "create commits O, B, tag S on B" ' |
||||
test_tick && |
||||
echo O >file && |
||||
git add file && |
||||
git commit -m O && |
||||
|
||||
test_tick && |
||||
echo B >file && |
||||
git add file && |
||||
git commit -m B && |
||||
B=$(git rev-parse --verify HEAD) && |
||||
|
||||
git tag -a -m tag2 tag2 $B && |
||||
S=$(git rev-parse --verify tag2) |
||||
' |
||||
|
||||
cat - <<EOF >expect |
||||
#S |
||||
want $B |
||||
want $S |
||||
#E |
||||
EOF |
||||
test_expect_success 'fetch B, S (commit and tag : 1 connection)' ' |
||||
rm -f $U |
||||
( |
||||
cd cloned && |
||||
GIT_DEBUG_SEND_PACK=3 git fetch 3>../$U && |
||||
test $B = $(git rev-parse --verify origin/master) && |
||||
test $B = $(git rev-parse --verify tag2^0) && |
||||
test $S = $(git rev-parse --verify tag2) |
||||
) && |
||||
test -s $U && |
||||
cut -d" " -f1,2 $U >actual && |
||||
git diff expect actual |
||||
' |
||||
|
||||
cat - <<EOF >expect |
||||
#S |
||||
want $B |
||||
want $S |
||||
#E |
||||
EOF |
||||
test_expect_success 'new clone fetch master and tags' ' |
||||
git branch -D cat |
||||
rm -f $U |
||||
( |
||||
mkdir clone2 && |
||||
cd clone2 && |
||||
git init && |
||||
git remote add origin .. && |
||||
GIT_DEBUG_SEND_PACK=3 git fetch 3>../$U && |
||||
test $B = $(git rev-parse --verify origin/master) && |
||||
test $S = $(git rev-parse --verify tag2) && |
||||
test $B = $(git rev-parse --verify tag2^0) && |
||||
test $T = $(git rev-parse --verify tag1) && |
||||
test $A = $(git rev-parse --verify tag1^0) |
||||
) && |
||||
test -s $U && |
||||
cut -d" " -f1,2 $U >actual && |
||||
git diff expect actual |
||||
' |
||||
|
||||
test_done |
||||
Loading…
Reference in new issue