2005-10-28 04:47:38 +02:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2005 Johannes Schindelin
|
|
|
|
#
|
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_description='Testing multi_ack pack fetching'
|
2005-10-28 04:47:38 +02:00
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
# Test fetch-pack/upload-pack pair.
|
|
|
|
|
|
|
|
# Some convenience functions
|
|
|
|
|
2006-05-26 04:06:17 +02:00
|
|
|
add () {
|
2009-05-26 08:17:14 +02:00
|
|
|
name=$1 &&
|
|
|
|
text="$@" &&
|
2015-12-23 14:45:52 +01:00
|
|
|
branch=$(echo $name | sed -e 's/^\(.\).*$/\1/') &&
|
2009-05-26 08:17:14 +02:00
|
|
|
parents="" &&
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
shift &&
|
2005-10-28 04:47:38 +02:00
|
|
|
while test $1; do
|
2009-05-26 08:17:14 +02:00
|
|
|
parents="$parents -p $1" &&
|
2005-10-28 04:47:38 +02:00
|
|
|
shift
|
2009-05-26 08:17:14 +02:00
|
|
|
done &&
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
echo "$text" > test.txt &&
|
|
|
|
git update-index --add test.txt &&
|
|
|
|
tree=$(git write-tree) &&
|
2005-10-28 04:47:38 +02:00
|
|
|
# make sure timestamps are in correct order
|
2009-05-26 08:17:14 +02:00
|
|
|
test_tick &&
|
|
|
|
commit=$(echo "$text" | git commit-tree $tree $parents) &&
|
|
|
|
eval "$name=$commit; export $name" &&
|
2018-05-23 07:25:17 +02:00
|
|
|
git update-ref "refs/heads/$branch" "$commit" &&
|
2005-10-28 04:47:38 +02:00
|
|
|
eval ${branch}TIP=$commit
|
|
|
|
}
|
|
|
|
|
2006-05-26 04:06:17 +02:00
|
|
|
pull_to_client () {
|
2009-05-26 08:17:14 +02:00
|
|
|
number=$1 &&
|
|
|
|
heads=$2 &&
|
|
|
|
count=$3 &&
|
|
|
|
test_expect_success "$number pull" '
|
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git fetch-pack -k -v .. $heads &&
|
|
|
|
|
|
|
|
case "$heads" in
|
|
|
|
*A*)
|
2018-05-23 07:25:17 +02:00
|
|
|
git update-ref refs/heads/A "$ATIP";;
|
2009-05-26 08:17:14 +02:00
|
|
|
esac &&
|
|
|
|
case "$heads" in *B*)
|
2018-05-23 07:25:17 +02:00
|
|
|
git update-ref refs/heads/B "$BTIP";;
|
2009-05-26 08:17:14 +02:00
|
|
|
esac &&
|
2018-10-05 23:54:03 +02:00
|
|
|
|
|
|
|
git symbolic-ref HEAD refs/heads/$(
|
|
|
|
echo $heads |
|
|
|
|
sed -e "s/^\(.\).*$/\1/"
|
|
|
|
) &&
|
2009-05-26 08:17:14 +02:00
|
|
|
|
|
|
|
git fsck --full &&
|
|
|
|
|
|
|
|
mv .git/objects/pack/pack-* . &&
|
2015-12-23 14:45:52 +01:00
|
|
|
p=$(ls -1 pack-*.pack) &&
|
2009-05-26 08:17:14 +02:00
|
|
|
git unpack-objects <$p &&
|
|
|
|
git fsck --full &&
|
|
|
|
|
2015-12-23 14:45:52 +01:00
|
|
|
idx=$(echo pack-*.idx) &&
|
|
|
|
pack_count=$(git show-index <$idx | wc -l) &&
|
2009-05-26 08:17:14 +02:00
|
|
|
test $pack_count = $count &&
|
|
|
|
rm -f pack-*
|
|
|
|
)
|
|
|
|
'
|
2005-10-28 04:47:38 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
# Here begins the actual testing
|
|
|
|
|
|
|
|
# A1 - ... - A20 - A21
|
|
|
|
# \
|
|
|
|
# B1 - B2 - .. - B70
|
|
|
|
|
|
|
|
# client pulls A20, B1. Then tracks only B. Then pulls A.
|
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'setup' '
|
2005-10-28 04:47:38 +02:00
|
|
|
mkdir client &&
|
2009-05-26 08:17:14 +02:00
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git init &&
|
|
|
|
git config transfer.unpacklimit 0
|
|
|
|
) &&
|
|
|
|
add A1 &&
|
|
|
|
prev=1 &&
|
|
|
|
cur=2 &&
|
|
|
|
while [ $cur -le 10 ]; do
|
|
|
|
add A$cur $(eval echo \$A$prev) &&
|
|
|
|
prev=$cur &&
|
|
|
|
cur=$(($cur+1))
|
|
|
|
done &&
|
2010-10-31 02:46:54 +01:00
|
|
|
add B1 $A1 &&
|
2018-05-23 07:25:17 +02:00
|
|
|
git update-ref refs/heads/A "$ATIP" &&
|
|
|
|
git update-ref refs/heads/B "$BTIP" &&
|
2009-05-26 08:17:14 +02:00
|
|
|
git symbolic-ref HEAD refs/heads/B
|
|
|
|
'
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2011-12-13 01:44:40 +01:00
|
|
|
pull_to_client 1st "refs/heads/B refs/heads/A" $((11*3))
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'post 1st pull setup' '
|
|
|
|
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
|
|
|
|
'
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2011-12-13 01:44:40 +01:00
|
|
|
pull_to_client 2nd "refs/heads/B" $((64*3))
|
2005-10-28 04:47:38 +02:00
|
|
|
|
2011-12-13 01:44:40 +01:00
|
|
|
pull_to_client 3rd "refs/heads/A" $((1*3))
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2012-01-07 15:45:59 +01:00
|
|
|
test_expect_success 'single branch clone' '
|
|
|
|
git clone --single-branch "file://$(pwd)/." singlebranch
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'single branch object count' '
|
|
|
|
GIT_DIR=singlebranch/.git git count-objects -v |
|
|
|
|
grep "^in-pack:" > count.singlebranch &&
|
|
|
|
echo "in-pack: 198" >expected &&
|
|
|
|
test_cmp expected count.singlebranch
|
|
|
|
'
|
|
|
|
|
2012-06-22 11:35:47 +02:00
|
|
|
test_expect_success 'single given branch clone' '
|
|
|
|
git clone --single-branch --branch A "file://$(pwd)/." branch-a &&
|
|
|
|
test_must_fail git --git-dir=branch-a/.git rev-parse origin/B
|
|
|
|
'
|
|
|
|
|
2013-01-11 10:05:47 +01:00
|
|
|
test_expect_success 'clone shallow depth 1' '
|
|
|
|
git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0 &&
|
2015-12-23 14:45:52 +01:00
|
|
|
test "$(git --git-dir=shallow0/.git rev-list --count HEAD)" = 1
|
2013-01-11 10:05:47 +01:00
|
|
|
'
|
|
|
|
|
2013-05-26 03:16:15 +02:00
|
|
|
test_expect_success 'clone shallow depth 1 with fsck' '
|
|
|
|
git config --global fetch.fsckobjects true &&
|
|
|
|
git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0fsck &&
|
2015-12-23 14:45:52 +01:00
|
|
|
test "$(git --git-dir=shallow0fsck/.git rev-list --count HEAD)" = 1 &&
|
2013-05-26 03:16:15 +02:00
|
|
|
git config --global --unset fetch.fsckobjects
|
|
|
|
'
|
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow' '
|
2012-01-07 15:45:59 +01:00
|
|
|
git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow
|
2009-05-26 08:17:14 +02:00
|
|
|
'
|
2006-12-27 11:43:46 +01:00
|
|
|
|
2013-01-11 10:05:47 +01:00
|
|
|
test_expect_success 'clone shallow depth count' '
|
2015-12-23 14:45:52 +01:00
|
|
|
test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 2
|
2013-01-11 10:05:47 +01:00
|
|
|
'
|
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow &&
|
2013-01-11 10:05:47 +01:00
|
|
|
grep "^in-pack: 12" count.shallow
|
2006-12-27 11:43:46 +01:00
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow object count (part 2)' '
|
|
|
|
sed -e "/^in-pack:/d" -e "/^packs:/d" -e "/^size-pack:/d" \
|
|
|
|
-e "/: 0$/d" count.shallow > count_output &&
|
2018-08-19 23:57:22 +02:00
|
|
|
test_must_be_empty count_output
|
2009-05-26 08:17:14 +02:00
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'fsck in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fsck --full
|
|
|
|
)
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-08-24 06:04:09 +02:00
|
|
|
test_expect_success 'simple fetch in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fetch
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'no changes expected' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow.2 &&
|
|
|
|
cmp count.shallow count.shallow.2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch same depth in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fetch --depth=2
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'no changes expected' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow.3 &&
|
|
|
|
cmp count.shallow count.shallow.3
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'add two more' '
|
|
|
|
add B66 $B65 &&
|
|
|
|
add B67 $B66
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'pull in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git pull .. B
|
|
|
|
)
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow &&
|
|
|
|
grep "^count: 6" count.shallow
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'add two more (part 2)' '
|
|
|
|
add B68 $B67 &&
|
|
|
|
add B69 $B68
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'deepening pull in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git pull --depth 4 .. B
|
|
|
|
)
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow &&
|
|
|
|
grep "^count: 12" count.shallow
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'deepening fetch in shallow repo' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fetch --depth 4 .. A:A
|
|
|
|
)
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow &&
|
|
|
|
grep "^count: 18" count.shallow
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-05-26 08:17:14 +02:00
|
|
|
test_expect_success 'pull in shallow repo with missing merge base' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
2018-07-02 02:24:01 +02:00
|
|
|
git fetch --depth 4 .. A &&
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 21:21:09 +01:00
|
|
|
test_must_fail git merge --allow-unrelated-histories FETCH_HEAD
|
2009-05-26 08:17:14 +02:00
|
|
|
)
|
|
|
|
'
|
2006-10-30 20:10:13 +01:00
|
|
|
|
2009-08-24 06:04:09 +02:00
|
|
|
test_expect_success 'additional simple shallow deepenings' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fetch --depth=8 &&
|
|
|
|
git fetch --depth=10 &&
|
|
|
|
git fetch --depth=11
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-01-11 10:05:47 +01:00
|
|
|
test_expect_success 'clone shallow depth count' '
|
2015-12-23 14:45:52 +01:00
|
|
|
test "$(git --git-dir=shallow/.git rev-list --count HEAD)" = 11
|
2013-01-11 10:05:47 +01:00
|
|
|
'
|
|
|
|
|
2009-08-24 06:04:09 +02:00
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 21:21:09 +01:00
|
|
|
git prune &&
|
2009-08-24 06:04:09 +02:00
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow &&
|
merge: refuse to create too cool a merge by default
While it makes sense to allow merging unrelated histories of two
projects that started independently into one, in the way "gitk" was
merged to "git" itself aka "the coolest merge ever", such a merge is
still an unusual event. Worse, if somebody creates an independent
history by starting from a tarball of an established project and
sends a pull request to the original project, "git merge" however
happily creates such a merge without any sign of something unusual
is happening.
Teach "git merge" to refuse to create such a merge by default,
unless the user passes a new "--allow-unrelated-histories" option to
tell it that the user is aware that two unrelated projects are
merged.
Because such a "two project merge" is a rare event, a configuration
option to always allow such a merge is not added.
We could add the same option to "git pull" and have it passed
through to underlying "git merge". I do not have a fundamental
opposition against such a feature, but this commit does not do so
and instead leaves it as low-hanging fruit for others, because such
a "two project merge" would be done after fetching the other project
into some location in the working tree of an existing project and
making sure how well they fit together, it is sufficient to allow a
local merge without such an option pass-through from "git pull" to
"git merge". Many tests that are updated by this patch does the
pass-through manually by turning:
git pull something
into its equivalent:
git fetch something &&
git merge --allow-unrelated-histories FETCH_HEAD
If somebody is inclined to add such an option, updated tests in this
change need to be adjusted back to:
git pull --allow-unrelated-histories something
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-03-18 21:21:09 +01:00
|
|
|
grep "^count: 54" count.shallow
|
2009-08-24 06:04:09 +02:00
|
|
|
'
|
|
|
|
|
2013-01-11 10:05:46 +01:00
|
|
|
test_expect_success 'fetch --no-shallow on full repo' '
|
|
|
|
test_must_fail git fetch --noshallow
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch --depth --no-shallow' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
test_must_fail git fetch --depth=1 --noshallow
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'turn shallow to complete repository' '
|
|
|
|
(
|
|
|
|
cd shallow &&
|
|
|
|
git fetch --unshallow &&
|
|
|
|
! test -f .git/shallow &&
|
|
|
|
git fsck --full
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-01-07 15:45:59 +01:00
|
|
|
test_expect_success 'clone shallow without --no-single-branch' '
|
|
|
|
git clone --depth 1 "file://$(pwd)/." shallow2
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone shallow object count' '
|
|
|
|
(
|
|
|
|
cd shallow2 &&
|
|
|
|
git count-objects -v
|
|
|
|
) > count.shallow2 &&
|
2013-01-11 10:05:47 +01:00
|
|
|
grep "^in-pack: 3" count.shallow2
|
2012-01-07 15:45:59 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone shallow with --branch' '
|
|
|
|
git clone --depth 1 --branch A "file://$(pwd)/." shallow3
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone shallow object count' '
|
2013-01-11 10:05:47 +01:00
|
|
|
echo "in-pack: 3" > count3.expected &&
|
2012-01-07 15:45:59 +01:00
|
|
|
GIT_DIR=shallow3/.git git count-objects -v |
|
|
|
|
grep "^in-pack" > count3.actual &&
|
|
|
|
test_cmp count3.expected count3.actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'clone shallow with detached HEAD' '
|
|
|
|
git checkout HEAD^ &&
|
|
|
|
git clone --depth 1 "file://$(pwd)/." shallow5 &&
|
|
|
|
git checkout - &&
|
|
|
|
GIT_DIR=shallow5/.git git rev-parse HEAD >actual &&
|
|
|
|
git rev-parse HEAD^ >expected &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'shallow clone pulling tags' '
|
|
|
|
git tag -a -m A TAGA1 A &&
|
|
|
|
git tag -a -m B TAGB1 B &&
|
|
|
|
git tag TAGA2 A &&
|
|
|
|
git tag TAGB2 B &&
|
|
|
|
git clone --depth 1 "file://$(pwd)/." shallow6 &&
|
|
|
|
|
|
|
|
cat >taglist.expected <<\EOF &&
|
|
|
|
TAGB1
|
|
|
|
TAGB2
|
|
|
|
EOF
|
|
|
|
GIT_DIR=shallow6/.git git tag -l >taglist.actual &&
|
|
|
|
test_cmp taglist.expected taglist.actual &&
|
|
|
|
|
2013-01-11 10:05:47 +01:00
|
|
|
echo "in-pack: 4" > count6.expected &&
|
2012-01-07 15:45:59 +01:00
|
|
|
GIT_DIR=shallow6/.git git count-objects -v |
|
|
|
|
grep "^in-pack" > count6.actual &&
|
|
|
|
test_cmp count6.expected count6.actual
|
|
|
|
'
|
|
|
|
|
2012-01-16 10:46:15 +01:00
|
|
|
test_expect_success 'shallow cloning single tag' '
|
|
|
|
git clone --depth 1 --branch=TAGB1 "file://$(pwd)/." shallow7 &&
|
|
|
|
cat >taglist.expected <<\EOF &&
|
|
|
|
TAGB1
|
|
|
|
TAGB2
|
|
|
|
EOF
|
|
|
|
GIT_DIR=shallow7/.git git tag -l >taglist.actual &&
|
|
|
|
test_cmp taglist.expected taglist.actual &&
|
|
|
|
|
2013-01-11 10:05:47 +01:00
|
|
|
echo "in-pack: 4" > count7.expected &&
|
2012-01-16 10:46:15 +01:00
|
|
|
GIT_DIR=shallow7/.git git count-objects -v |
|
|
|
|
grep "^in-pack" > count7.actual &&
|
|
|
|
test_cmp count7.expected count7.actual
|
|
|
|
'
|
|
|
|
|
upload-pack: make sure "want" objects are parsed
When upload-pack receives a "want" line from the client, it
adds it to an object array. We call lookup_object to find
the actual object, which will only check for objects already
in memory. This works because we are expecting to find
objects that we already loaded during the ref advertisement.
We use the resulting object structs for a variety of
purposes. Some of them care only about the object flags, but
others care about the type of the object (e.g.,
ok_to_give_up), or even feed them to the revision parser
(when --depth is used), which assumes that objects it
receives are fully parsed.
Once upon a time, this was OK; any object we loaded into
memory would also have been parsed. But since 435c833
(upload-pack: use peel_ref for ref advertisements,
2012-10-04), we try to avoid parsing objects during the ref
advertisement. This means that lookup_object may return an
object with a type of OBJ_NONE. The resulting mess depends
on the exact set of objects, but can include the revision
parser barfing, or the shallow code sending the wrong set of
objects.
This patch teaches upload-pack to parse each "want" object
as we receive it. We do not replace the lookup_object call
with parse_object, as the current code is careful not to let
just any object appear on a "want" line, but rather only one
we have previously advertised (whereas parse_object would
actually load any arbitrary object from disk).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-03-16 11:27:01 +01:00
|
|
|
test_expect_success 'clone shallow with packed refs' '
|
|
|
|
git pack-refs --all &&
|
|
|
|
git clone --depth 1 --branch A "file://$(pwd)/." shallow8 &&
|
|
|
|
echo "in-pack: 4" > count8.expected &&
|
|
|
|
GIT_DIR=shallow8/.git git count-objects -v |
|
|
|
|
grep "^in-pack" > count8.actual &&
|
|
|
|
test_cmp count8.expected count8.actual
|
|
|
|
'
|
|
|
|
|
2013-05-02 16:56:07 +02:00
|
|
|
test_expect_success 'fetch in shallow repo unreachable shallow objects' '
|
|
|
|
(
|
|
|
|
git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog &&
|
|
|
|
git clone --depth 1 "file://$(pwd)/no-reflog" shallow9 &&
|
|
|
|
cd no-reflog &&
|
|
|
|
git tag -d TAGB1 TAGB2 &&
|
|
|
|
git update-ref refs/heads/B B~~ &&
|
|
|
|
git gc --prune=now &&
|
|
|
|
cd ../shallow9 &&
|
|
|
|
git fetch origin &&
|
|
|
|
git fsck --no-dangling
|
|
|
|
)
|
|
|
|
'
|
2013-08-28 18:02:02 +02:00
|
|
|
test_expect_success 'fetch creating new shallow root' '
|
|
|
|
(
|
|
|
|
git clone "file://$(pwd)/." shallow10 &&
|
|
|
|
git commit --allow-empty -m empty &&
|
|
|
|
cd shallow10 &&
|
|
|
|
git fetch --depth=1 --progress 2>actual &&
|
|
|
|
# This should fetch only the empty commit, no tree or
|
|
|
|
# blob objects
|
2018-07-21 09:49:24 +02:00
|
|
|
test_i18ngrep "remote: Total 1" actual
|
2013-08-28 18:02:02 +02:00
|
|
|
)
|
|
|
|
'
|
2013-05-02 16:56:07 +02:00
|
|
|
|
2012-04-02 17:16:24 +02:00
|
|
|
test_expect_success 'setup tests for the --stdin parameter' '
|
|
|
|
for head in C D E F
|
|
|
|
do
|
|
|
|
add $head
|
|
|
|
done &&
|
|
|
|
for head in A B C D E F
|
|
|
|
do
|
|
|
|
git tag $head $head
|
|
|
|
done &&
|
2015-03-20 11:07:15 +01:00
|
|
|
cat >input <<-\EOF &&
|
2012-04-02 17:16:24 +02:00
|
|
|
refs/heads/C
|
|
|
|
refs/heads/A
|
|
|
|
refs/heads/D
|
|
|
|
refs/tags/C
|
|
|
|
refs/heads/B
|
|
|
|
refs/tags/A
|
|
|
|
refs/heads/E
|
|
|
|
refs/tags/B
|
|
|
|
refs/tags/E
|
|
|
|
refs/tags/D
|
|
|
|
EOF
|
|
|
|
sort <input >expect &&
|
|
|
|
(
|
|
|
|
echo refs/heads/E &&
|
|
|
|
echo refs/tags/E &&
|
|
|
|
cat input
|
|
|
|
) >input.dup
|
|
|
|
'
|
|
|
|
|
2018-12-17 23:40:54 +01:00
|
|
|
test_expect_success 'setup fetch refs from cmdline v[12]' '
|
|
|
|
cp -r client client1 &&
|
|
|
|
cp -r client client2
|
2012-04-02 17:16:24 +02:00
|
|
|
'
|
|
|
|
|
2018-12-17 23:40:54 +01:00
|
|
|
for version in '' 1 2
|
|
|
|
do
|
|
|
|
test_expect_success "protocol.version=$version fetch refs from cmdline" "
|
|
|
|
(
|
|
|
|
cd client$version &&
|
|
|
|
GIT_TEST_PROTOCOL_VERSION=$version git fetch-pack --no-progress .. \$(cat ../input)
|
|
|
|
) >output &&
|
|
|
|
cut -d ' ' -f 2 <output | sort >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
"
|
|
|
|
done
|
|
|
|
|
2012-04-02 17:16:24 +02:00
|
|
|
test_expect_success 'fetch refs from stdin' '
|
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git fetch-pack --stdin --no-progress .. <../input
|
|
|
|
) >output &&
|
|
|
|
cut -d " " -f 2 <output | sort >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch mixed refs from cmdline and stdin' '
|
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
tail -n +5 ../input |
|
|
|
|
git fetch-pack --stdin --no-progress .. $(head -n 4 ../input)
|
|
|
|
) >output &&
|
|
|
|
cut -d " " -f 2 <output | sort >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test duplicate refs from stdin' '
|
|
|
|
(
|
|
|
|
cd client &&
|
2012-09-09 08:19:42 +02:00
|
|
|
git fetch-pack --stdin --no-progress .. <../input.dup
|
2012-04-02 17:16:24 +02:00
|
|
|
) >output &&
|
|
|
|
cut -d " " -f 2 <output | sort >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2012-09-09 08:19:36 +02:00
|
|
|
test_expect_success 'set up tests of missing reference' '
|
|
|
|
cat >expect-error <<-\EOF
|
|
|
|
error: no such remote ref refs/heads/xyzzy
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
2012-09-09 08:19:47 +02:00
|
|
|
test_expect_success 'test lonely missing ref' '
|
2012-09-09 08:19:36 +02:00
|
|
|
(
|
|
|
|
cd client &&
|
2018-02-24 00:39:45 +01:00
|
|
|
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
|
|
|
|
) &&
|
2017-02-22 17:01:22 +01:00
|
|
|
test_i18ncmp expect-error error-m
|
2012-09-09 08:19:36 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test missing ref after existing' '
|
|
|
|
(
|
|
|
|
cd client &&
|
2018-02-24 00:39:45 +01:00
|
|
|
test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
|
|
|
|
) &&
|
2017-02-22 17:01:22 +01:00
|
|
|
test_i18ncmp expect-error error-em
|
2012-09-09 08:19:36 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'test missing ref before existing' '
|
|
|
|
(
|
|
|
|
cd client &&
|
2018-02-24 00:39:45 +01:00
|
|
|
test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
|
|
|
|
) &&
|
2017-02-22 17:01:22 +01:00
|
|
|
test_i18ncmp expect-error error-me
|
2012-09-09 08:19:36 +02:00
|
|
|
'
|
|
|
|
|
2012-09-09 08:19:49 +02:00
|
|
|
test_expect_success 'test --all, --depth, and explicit head' '
|
2012-09-09 08:19:37 +02:00
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git fetch-pack --no-progress --all --depth=1 .. refs/heads/A
|
|
|
|
) >out-adh 2>error-adh
|
|
|
|
'
|
|
|
|
|
2012-09-09 08:19:49 +02:00
|
|
|
test_expect_success 'test --all, --depth, and explicit tag' '
|
2012-09-09 08:19:37 +02:00
|
|
|
git tag OLDTAG refs/heads/B~5 &&
|
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git fetch-pack --no-progress --all --depth=1 .. refs/tags/OLDTAG
|
|
|
|
) >out-adt 2>error-adt
|
|
|
|
'
|
|
|
|
|
2018-06-11 07:53:57 +02:00
|
|
|
test_expect_success 'test --all with tag to non-tip' '
|
|
|
|
git commit --allow-empty -m non-tip &&
|
|
|
|
git commit --allow-empty -m tip &&
|
|
|
|
git tag -m "annotated" non-tip HEAD^ &&
|
|
|
|
(
|
|
|
|
cd client &&
|
|
|
|
git fetch-pack --all ..
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2018-06-13 11:28:21 +02:00
|
|
|
test_expect_success 'test --all wrt tag to non-commits' '
|
|
|
|
# create tag-to-{blob,tree,commit,tag}, making sure all tagged objects
|
|
|
|
# are reachable only via created tag references.
|
|
|
|
blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
|
|
|
|
git tag -a -m "tag -> blob" tag-to-blob $blob &&
|
2018-07-03 18:55:19 +02:00
|
|
|
|
2018-06-13 11:28:21 +02:00
|
|
|
tree=$(printf "100644 blob $blob\tfile" | git mktree) &&
|
|
|
|
git tag -a -m "tag -> tree" tag-to-tree $tree &&
|
2018-07-03 18:55:19 +02:00
|
|
|
|
2018-06-13 11:28:21 +02:00
|
|
|
tree2=$(printf "100644 blob $blob\tfile2" | git mktree) &&
|
|
|
|
commit=$(git commit-tree -m "hello commit" $tree) &&
|
|
|
|
git tag -a -m "tag -> commit" tag-to-commit $commit &&
|
2018-07-03 18:55:19 +02:00
|
|
|
|
2018-06-13 11:28:21 +02:00
|
|
|
blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) &&
|
2018-07-03 18:55:19 +02:00
|
|
|
tag=$(git mktag <<-EOF
|
|
|
|
object $blob2
|
|
|
|
type blob
|
|
|
|
tag tag-to-blob2
|
|
|
|
tagger author A U Thor <author@example.com> 0 +0000
|
|
|
|
|
|
|
|
hello tag
|
|
|
|
EOF
|
|
|
|
) &&
|
2018-06-13 11:28:21 +02:00
|
|
|
git tag -a -m "tag -> tag" tag-to-tag $tag &&
|
2018-07-03 18:55:19 +02:00
|
|
|
|
2018-06-13 11:28:21 +02:00
|
|
|
# `fetch-pack --all` should succeed fetching all those objects.
|
|
|
|
mkdir fetchall &&
|
|
|
|
(
|
|
|
|
cd fetchall &&
|
|
|
|
git init &&
|
|
|
|
git fetch-pack --all .. &&
|
|
|
|
git cat-file blob $blob >/dev/null &&
|
|
|
|
git cat-file tree $tree >/dev/null &&
|
|
|
|
git cat-file commit $commit >/dev/null &&
|
|
|
|
git cat-file tag $tag >/dev/null
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-08-26 04:17:26 +02:00
|
|
|
test_expect_success 'shallow fetch with tags does not break the repository' '
|
|
|
|
mkdir repo1 &&
|
|
|
|
(
|
|
|
|
cd repo1 &&
|
|
|
|
git init &&
|
|
|
|
test_commit 1 &&
|
|
|
|
test_commit 2 &&
|
|
|
|
test_commit 3 &&
|
|
|
|
mkdir repo2 &&
|
|
|
|
cd repo2 &&
|
|
|
|
git init &&
|
|
|
|
git fetch --depth=2 ../.git master:branch &&
|
|
|
|
git fsck
|
|
|
|
)
|
|
|
|
'
|
2016-03-01 03:12:56 +01:00
|
|
|
|
|
|
|
test_expect_success 'fetch-pack can fetch a raw sha1' '
|
|
|
|
git init hidden &&
|
|
|
|
(
|
|
|
|
cd hidden &&
|
|
|
|
test_commit 1 &&
|
|
|
|
test_commit 2 &&
|
|
|
|
git update-ref refs/hidden/one HEAD^ &&
|
|
|
|
git config transfer.hiderefs refs/hidden &&
|
|
|
|
git config uploadpack.allowtipsha1inwant true
|
|
|
|
) &&
|
|
|
|
git fetch-pack hidden $(git -C hidden rev-parse refs/hidden/one)
|
|
|
|
'
|
|
|
|
|
2017-05-15 19:32:20 +02:00
|
|
|
test_expect_success 'fetch-pack can fetch a raw sha1 that is advertised as a ref' '
|
|
|
|
rm -rf server client &&
|
|
|
|
git init server &&
|
|
|
|
test_commit -C server 1 &&
|
|
|
|
|
|
|
|
git init client &&
|
|
|
|
git -C client fetch-pack ../server \
|
|
|
|
$(git -C server rev-parse refs/heads/master)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch-pack can fetch a raw sha1 overlapping a named ref' '
|
|
|
|
rm -rf server client &&
|
|
|
|
git init server &&
|
|
|
|
test_commit -C server 1 &&
|
|
|
|
test_commit -C server 2 &&
|
|
|
|
|
|
|
|
git init client &&
|
|
|
|
git -C client fetch-pack ../server \
|
|
|
|
$(git -C server rev-parse refs/tags/1) refs/tags/1
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised as a ref' '
|
|
|
|
rm -rf server &&
|
|
|
|
|
|
|
|
git init server &&
|
|
|
|
test_commit -C server 5 &&
|
|
|
|
git -C server tag -d 5 &&
|
|
|
|
test_commit -C server 6 &&
|
|
|
|
|
|
|
|
git init client &&
|
|
|
|
test_must_fail git -C client fetch-pack ../server \
|
|
|
|
$(git -C server rev-parse refs/heads/master^) 2>err &&
|
|
|
|
test_i18ngrep "Server does not allow request for unadvertised object" err
|
|
|
|
'
|
|
|
|
|
2013-11-28 20:49:29 +01:00
|
|
|
check_prot_path () {
|
|
|
|
cat >expected <<-EOF &&
|
|
|
|
Diag: url=$1
|
|
|
|
Diag: protocol=$2
|
|
|
|
Diag: path=$3
|
|
|
|
EOF
|
|
|
|
git fetch-pack --diag-url "$1" | grep -v hostandport= >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
}
|
|
|
|
|
2015-02-21 16:52:55 +01:00
|
|
|
check_prot_host_port_path () {
|
|
|
|
case "$2" in
|
|
|
|
*ssh*)
|
|
|
|
pp=ssh
|
|
|
|
uah=userandhost
|
|
|
|
ehost=$(echo $3 | tr -d "[]")
|
|
|
|
diagport="Diag: port=$4"
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
pp=$p
|
|
|
|
uah=hostandport
|
|
|
|
ehost=$(echo $3$4 | sed -e "s/22$/:22/" -e "s/NONE//")
|
|
|
|
diagport=""
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
cat >exp <<-EOF &&
|
2013-11-28 20:49:29 +01:00
|
|
|
Diag: url=$1
|
2015-02-21 16:52:55 +01:00
|
|
|
Diag: protocol=$pp
|
|
|
|
Diag: $uah=$ehost
|
|
|
|
$diagport
|
|
|
|
Diag: path=$5
|
2013-11-28 20:49:29 +01:00
|
|
|
EOF
|
2015-02-21 16:52:55 +01:00
|
|
|
grep -v "^$" exp >expected
|
2013-11-28 20:49:29 +01:00
|
|
|
git fetch-pack --diag-url "$1" >actual &&
|
|
|
|
test_cmp expected actual
|
|
|
|
}
|
|
|
|
|
|
|
|
for r in repo re:po re/po
|
|
|
|
do
|
|
|
|
# git or ssh with scheme
|
|
|
|
for p in "ssh+git" "git+ssh" git ssh
|
|
|
|
do
|
2015-02-21 16:52:55 +01:00
|
|
|
for h in host user@host user@[::1] user@::1
|
2013-11-28 20:49:29 +01:00
|
|
|
do
|
2015-04-07 22:03:25 +02:00
|
|
|
for c in "" :
|
|
|
|
do
|
|
|
|
test_expect_success "fetch-pack --diag-url $p://$h$c/$r" '
|
|
|
|
check_prot_host_port_path $p://$h/$r $p "$h" NONE "/$r"
|
|
|
|
'
|
|
|
|
# "/~" -> "~" conversion
|
|
|
|
test_expect_success "fetch-pack --diag-url $p://$h$c/~$r" '
|
|
|
|
check_prot_host_port_path $p://$h/~$r $p "$h" NONE "~$r"
|
|
|
|
'
|
|
|
|
done
|
2015-02-21 16:52:55 +01:00
|
|
|
done
|
|
|
|
for h in host User@host User@[::1]
|
|
|
|
do
|
|
|
|
test_expect_success "fetch-pack --diag-url $p://$h:22/$r" '
|
|
|
|
check_prot_host_port_path $p://$h:22/$r $p "$h" 22 "/$r"
|
2013-11-28 20:49:29 +01:00
|
|
|
'
|
|
|
|
done
|
|
|
|
done
|
|
|
|
# file with scheme
|
|
|
|
for p in file
|
|
|
|
do
|
|
|
|
test_expect_success "fetch-pack --diag-url $p://$h/$r" '
|
|
|
|
check_prot_path $p://$h/$r $p "/$r"
|
|
|
|
'
|
|
|
|
# No "/~" -> "~" conversion for file
|
|
|
|
test_expect_success "fetch-pack --diag-url $p://$h/~$r" '
|
|
|
|
check_prot_path $p://$h/~$r $p "/~$r"
|
|
|
|
'
|
|
|
|
done
|
2013-11-28 20:49:38 +01:00
|
|
|
# file without scheme
|
|
|
|
for h in nohost nohost:12 [::1] [::1]:23 [ [:aa
|
|
|
|
do
|
|
|
|
test_expect_success "fetch-pack --diag-url ./$h:$r" '
|
|
|
|
check_prot_path ./$h:$r $p "./$h:$r"
|
|
|
|
'
|
|
|
|
# No "/~" -> "~" conversion for file
|
|
|
|
test_expect_success "fetch-pack --diag-url ./$p:$h/~$r" '
|
|
|
|
check_prot_path ./$p:$h/~$r $p "./$p:$h/~$r"
|
|
|
|
'
|
|
|
|
done
|
|
|
|
#ssh without scheme
|
|
|
|
p=ssh
|
|
|
|
for h in host [::1]
|
|
|
|
do
|
|
|
|
test_expect_success "fetch-pack --diag-url $h:$r" '
|
2015-02-21 16:52:55 +01:00
|
|
|
check_prot_host_port_path $h:$r $p "$h" NONE "$r"
|
2013-11-28 20:49:38 +01:00
|
|
|
'
|
|
|
|
# Do "/~" -> "~" conversion
|
|
|
|
test_expect_success "fetch-pack --diag-url $h:/~$r" '
|
2015-02-21 16:52:55 +01:00
|
|
|
check_prot_host_port_path $h:/~$r $p "$h" NONE "~$r"
|
2013-11-28 20:49:38 +01:00
|
|
|
'
|
|
|
|
done
|
2013-11-28 20:49:29 +01:00
|
|
|
done
|
2013-08-26 04:17:26 +02:00
|
|
|
|
2013-11-28 20:50:03 +01:00
|
|
|
test_expect_success MINGW 'fetch-pack --diag-url file://c:/repo' '
|
|
|
|
check_prot_path file://c:/repo file c:/repo
|
|
|
|
'
|
|
|
|
test_expect_success MINGW 'fetch-pack --diag-url c:repo' '
|
|
|
|
check_prot_path c:repo file c:repo
|
|
|
|
'
|
|
|
|
|
2016-06-12 12:54:01 +02:00
|
|
|
test_expect_success 'clone shallow since ...' '
|
|
|
|
test_create_repo shallow-since &&
|
|
|
|
(
|
|
|
|
cd shallow-since &&
|
|
|
|
GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
|
|
|
|
GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
|
|
|
|
GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
|
|
|
|
git clone --shallow-since "300000000 +0700" "file://$(pwd)/." ../shallow11 &&
|
|
|
|
git -C ../shallow11 log --pretty=tformat:%s HEAD >actual &&
|
|
|
|
echo three >expected &&
|
|
|
|
test_cmp expected actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch shallow since ...' '
|
|
|
|
git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
|
|
|
|
git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
three
|
|
|
|
two
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
2018-05-26 13:35:18 +02:00
|
|
|
test_expect_success 'clone shallow since selects no commits' '
|
|
|
|
test_create_repo shallow-since-the-future &&
|
|
|
|
(
|
|
|
|
cd shallow-since-the-future &&
|
|
|
|
GIT_COMMITTER_DATE="100000000 +0700" git commit --allow-empty -m one &&
|
|
|
|
GIT_COMMITTER_DATE="200000000 +0700" git commit --allow-empty -m two &&
|
|
|
|
GIT_COMMITTER_DATE="300000000 +0700" git commit --allow-empty -m three &&
|
|
|
|
test_must_fail git clone --shallow-since "900000000 +0700" "file://$(pwd)/." ../shallow111
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2016-06-12 12:54:06 +02:00
|
|
|
test_expect_success 'shallow clone exclude tag two' '
|
|
|
|
test_create_repo shallow-exclude &&
|
|
|
|
(
|
|
|
|
cd shallow-exclude &&
|
|
|
|
test_commit one &&
|
|
|
|
test_commit two &&
|
|
|
|
test_commit three &&
|
|
|
|
git clone --shallow-exclude two "file://$(pwd)/." ../shallow12 &&
|
|
|
|
git -C ../shallow12 log --pretty=tformat:%s HEAD >actual &&
|
|
|
|
echo three >expected &&
|
|
|
|
test_cmp expected actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch exclude tag one' '
|
|
|
|
git -C shallow12 fetch --shallow-exclude one origin &&
|
|
|
|
git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
|
|
|
|
test_write_lines three two >expected &&
|
|
|
|
test_cmp expected actual
|
|
|
|
'
|
|
|
|
|
fetch, upload-pack: --deepen=N extends shallow boundary by N commits
In git-fetch, --depth argument is always relative with the latest
remote refs. This makes it a bit difficult to cover this use case,
where the user wants to make the shallow history, say 3 levels
deeper. It would work if remote refs have not moved yet, but nobody
can guarantee that, especially when that use case is performed a
couple months after the last clone or "git fetch --depth". Also,
modifying shallow boundary using --depth does not work well with
clones created by --since or --not.
This patch fixes that. A new argument --deepen=<N> will add <N> more (*)
parent commits to the current history regardless of where remote refs
are.
Have/Want negotiation is still respected. So if remote refs move, the
server will send two chunks: one between "have" and "want" and another
to extend shallow history. In theory, the client could send no "want"s
in order to get the second chunk only. But the protocol does not allow
that. Either you send no want lines, which means ls-remote; or you
have to send at least one want line that carries deep-relative to the
server..
The main work was done by Dongcan Jiang. I fixed it up here and there.
And of course all the bugs belong to me.
(*) We could even support --deepen=<N> where <N> is negative. In that
case we can cut some history from the shallow clone. This operation
(and --depth=<shorter depth>) does not require interaction with remote
side (and more complicated to implement as a result).
Helped-by: Duy Nguyen <pclouds@gmail.com>
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Dongcan Jiang <dongcan.jiang@gmail.com>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-06-12 12:54:09 +02:00
|
|
|
test_expect_success 'fetching deepen' '
|
|
|
|
test_create_repo shallow-deepen &&
|
|
|
|
(
|
|
|
|
cd shallow-deepen &&
|
|
|
|
test_commit one &&
|
|
|
|
test_commit two &&
|
|
|
|
test_commit three &&
|
|
|
|
git clone --depth 1 "file://$(pwd)/." deepen &&
|
|
|
|
test_commit four &&
|
|
|
|
git -C deepen log --pretty=tformat:%s master >actual &&
|
|
|
|
echo three >expected &&
|
|
|
|
test_cmp expected actual &&
|
|
|
|
git -C deepen fetch --deepen=1 &&
|
|
|
|
git -C deepen log --pretty=tformat:%s origin/master >actual &&
|
|
|
|
cat >expected <<-\EOF &&
|
|
|
|
four
|
|
|
|
three
|
|
|
|
two
|
|
|
|
EOF
|
|
|
|
test_cmp expected actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
fetch-pack: use ref adv. to prune "have" sent
In negotiation using protocol v2, fetch-pack sometimes does not make
full use of the information obtained in the ref advertisement:
specifically, that if the server advertises a commit that the client
also has, the client never needs to inform the server that it has the
commit's parents, since it can just tell the server that it has the
advertised commit and it knows that the server can and will infer the
rest.
This is because, in do_fetch_pack_v2(), rev_list_insert_ref_oid() is
invoked before mark_complete_and_common_ref(). This means that if we
have a commit that is both our ref and their ref, it would be enqueued
by rev_list_insert_ref_oid() as SEEN, and since it is thus already SEEN,
mark_complete_and_common_ref() would not enqueue it.
If mark_complete_and_common_ref() were invoked first, as it is in
do_fetch_pack() for protocol v0, then mark_complete_and_common_ref()
would enqueue it with COMMON_REF | SEEN. The addition of COMMON_REF
ensures that its parents are not sent as "have" lines.
Change the order in do_fetch_pack_v2() to be consistent with
do_fetch_pack(), and to avoid sending unnecessary "have" lines.
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-06-15 00:54:25 +02:00
|
|
|
test_expect_success 'use ref advertisement to prune "have" lines sent' '
|
|
|
|
rm -rf server client &&
|
|
|
|
git init server &&
|
|
|
|
test_commit -C server both_have_1 &&
|
|
|
|
git -C server tag -d both_have_1 &&
|
|
|
|
test_commit -C server both_have_2 &&
|
|
|
|
|
|
|
|
git clone server client &&
|
|
|
|
test_commit -C server server_has &&
|
|
|
|
test_commit -C client client_has &&
|
|
|
|
|
|
|
|
# In both protocol v0 and v2, ensure that the parent of both_have_2 is
|
|
|
|
# not sent as a "have" line. The client should know that the server has
|
|
|
|
# both_have_2, so it only needs to inform the server that it has
|
|
|
|
# both_have_2, and the server can infer the rest.
|
|
|
|
|
|
|
|
rm -f trace &&
|
|
|
|
cp -r client clientv0 &&
|
|
|
|
GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv0 \
|
|
|
|
fetch origin server_has both_have_2 &&
|
|
|
|
grep "have $(git -C client rev-parse client_has)" trace &&
|
|
|
|
grep "have $(git -C client rev-parse both_have_2)" trace &&
|
|
|
|
! grep "have $(git -C client rev-parse both_have_2^)" trace &&
|
|
|
|
|
|
|
|
rm -f trace &&
|
|
|
|
cp -r client clientv2 &&
|
|
|
|
GIT_TRACE_PACKET="$(pwd)/trace" git -C clientv2 -c protocol.version=2 \
|
|
|
|
fetch origin server_has both_have_2 &&
|
|
|
|
grep "have $(git -C client rev-parse client_has)" trace &&
|
|
|
|
grep "have $(git -C client rev-parse both_have_2)" trace &&
|
|
|
|
! grep "have $(git -C client rev-parse both_have_2^)" trace
|
|
|
|
'
|
|
|
|
|
2017-12-08 16:58:42 +01:00
|
|
|
test_expect_success 'filtering by size' '
|
|
|
|
rm -rf server client &&
|
|
|
|
test_create_repo server &&
|
|
|
|
test_commit -C server one &&
|
|
|
|
test_config -C server uploadpack.allowfilter 1 &&
|
|
|
|
|
|
|
|
test_create_repo client &&
|
|
|
|
git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
|
|
|
|
|
|
|
|
# Ensure that object is not inadvertently fetched
|
|
|
|
test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'filtering by size has no effect if support for it is not advertised' '
|
|
|
|
rm -rf server client &&
|
|
|
|
test_create_repo server &&
|
|
|
|
test_commit -C server one &&
|
|
|
|
|
|
|
|
test_create_repo client &&
|
|
|
|
git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
|
|
|
|
|
|
|
|
# Ensure that object is fetched
|
|
|
|
git -C client cat-file -e $(git hash-object server/one.t) &&
|
|
|
|
|
|
|
|
test_i18ngrep "filtering not recognized by server" err
|
|
|
|
'
|
|
|
|
|
2017-12-08 16:58:44 +01:00
|
|
|
fetch_filter_blob_limit_zero () {
|
|
|
|
SERVER="$1"
|
|
|
|
URL="$2"
|
|
|
|
|
|
|
|
rm -rf "$SERVER" client &&
|
|
|
|
test_create_repo "$SERVER" &&
|
|
|
|
test_commit -C "$SERVER" one &&
|
|
|
|
test_config -C "$SERVER" uploadpack.allowfilter 1 &&
|
|
|
|
|
|
|
|
git clone "$URL" client &&
|
|
|
|
test_config -C client extensions.partialclone origin &&
|
|
|
|
|
|
|
|
test_commit -C "$SERVER" two &&
|
|
|
|
|
|
|
|
git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere &&
|
|
|
|
|
|
|
|
# Ensure that commit is fetched, but blob is not
|
|
|
|
test_config -C client extensions.partialclone "arbitrary string" &&
|
|
|
|
git -C client cat-file -e $(git -C "$SERVER" rev-parse two) &&
|
|
|
|
test_must_fail git -C client cat-file -e $(git hash-object "$SERVER/two.t")
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'fetch with --filter=blob:limit=0' '
|
|
|
|
fetch_filter_blob_limit_zero server server
|
|
|
|
'
|
|
|
|
|
|
|
|
. "$TEST_DIRECTORY"/lib-httpd.sh
|
|
|
|
start_httpd
|
|
|
|
|
|
|
|
test_expect_success 'fetch with --filter=blob:limit=0 and HTTP' '
|
|
|
|
fetch_filter_blob_limit_zero "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
|
|
|
|
'
|
|
|
|
|
|
|
|
stop_httpd
|
|
|
|
|
|
|
|
|
2005-10-28 04:47:38 +02:00
|
|
|
test_done
|