revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
Vincent Ambo
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
250
third_party/git/t/t5703-upload-pack-ref-in-want.sh
vendored
250
third_party/git/t/t5703-upload-pack-ref-in-want.sh
vendored
|
|
@ -18,16 +18,14 @@ get_actual_commits () {
|
|||
p
|
||||
}' <out | test-tool pkt-line unpack-sideband >o.pack &&
|
||||
git index-pack o.pack &&
|
||||
git verify-pack -v o.idx >objs &&
|
||||
grep commit objs | cut -d" " -f1 | sort >actual_commits
|
||||
git verify-pack -v o.idx | grep commit | cut -c-40 | sort >actual_commits
|
||||
}
|
||||
|
||||
check_output () {
|
||||
get_actual_refs &&
|
||||
test_cmp expected_refs actual_refs &&
|
||||
get_actual_commits &&
|
||||
sort expected_commits >sorted_commits &&
|
||||
test_cmp sorted_commits actual_commits
|
||||
test_cmp expected_commits actual_commits
|
||||
}
|
||||
|
||||
# c(o/foo) d(o/bar)
|
||||
|
|
@ -37,7 +35,6 @@ check_output () {
|
|||
# \ | /
|
||||
# a
|
||||
test_expect_success 'setup repository' '
|
||||
test_oid_init &&
|
||||
test_commit a &&
|
||||
git checkout -b o/foo &&
|
||||
test_commit b &&
|
||||
|
|
@ -78,19 +75,17 @@ test_expect_success 'invalid want-ref line' '
|
|||
'
|
||||
|
||||
test_expect_success 'basic want-ref' '
|
||||
oid=$(git rev-parse f) &&
|
||||
cat >expected_refs <<-EOF &&
|
||||
$oid refs/heads/master
|
||||
$(git rev-parse f) refs/heads/master
|
||||
EOF
|
||||
git rev-parse f >expected_commits &&
|
||||
git rev-parse f | sort >expected_commits &&
|
||||
|
||||
oid=$(git rev-parse a) &&
|
||||
test-tool pkt-line pack >in <<-EOF &&
|
||||
command=fetch
|
||||
0001
|
||||
no-progress
|
||||
want-ref refs/heads/master
|
||||
have $oid
|
||||
have $(git rev-parse a)
|
||||
done
|
||||
0000
|
||||
EOF
|
||||
|
|
@ -100,22 +95,19 @@ test_expect_success 'basic want-ref' '
|
|||
'
|
||||
|
||||
test_expect_success 'multiple want-ref lines' '
|
||||
oid_c=$(git rev-parse c) &&
|
||||
oid_d=$(git rev-parse d) &&
|
||||
cat >expected_refs <<-EOF &&
|
||||
$oid_c refs/heads/o/foo
|
||||
$oid_d refs/heads/o/bar
|
||||
$(git rev-parse c) refs/heads/o/foo
|
||||
$(git rev-parse d) refs/heads/o/bar
|
||||
EOF
|
||||
git rev-parse c d >expected_commits &&
|
||||
git rev-parse c d | sort >expected_commits &&
|
||||
|
||||
oid=$(git rev-parse b) &&
|
||||
test-tool pkt-line pack >in <<-EOF &&
|
||||
command=fetch
|
||||
0001
|
||||
no-progress
|
||||
want-ref refs/heads/o/foo
|
||||
want-ref refs/heads/o/bar
|
||||
have $oid
|
||||
have $(git rev-parse b)
|
||||
done
|
||||
0000
|
||||
EOF
|
||||
|
|
@ -125,11 +117,10 @@ test_expect_success 'multiple want-ref lines' '
|
|||
'
|
||||
|
||||
test_expect_success 'mix want and want-ref' '
|
||||
oid=$(git rev-parse f) &&
|
||||
cat >expected_refs <<-EOF &&
|
||||
$oid refs/heads/master
|
||||
$(git rev-parse f) refs/heads/master
|
||||
EOF
|
||||
git rev-parse e f >expected_commits &&
|
||||
git rev-parse e f | sort >expected_commits &&
|
||||
|
||||
test-tool pkt-line pack >in <<-EOF &&
|
||||
command=fetch
|
||||
|
|
@ -147,19 +138,17 @@ test_expect_success 'mix want and want-ref' '
|
|||
'
|
||||
|
||||
test_expect_success 'want-ref with ref we already have commit for' '
|
||||
oid=$(git rev-parse c) &&
|
||||
cat >expected_refs <<-EOF &&
|
||||
$oid refs/heads/o/foo
|
||||
$(git rev-parse c) refs/heads/o/foo
|
||||
EOF
|
||||
>expected_commits &&
|
||||
|
||||
oid=$(git rev-parse c) &&
|
||||
test-tool pkt-line pack >in <<-EOF &&
|
||||
command=fetch
|
||||
0001
|
||||
no-progress
|
||||
want-ref refs/heads/o/foo
|
||||
have $oid
|
||||
have $(git rev-parse c)
|
||||
done
|
||||
0000
|
||||
EOF
|
||||
|
|
@ -168,6 +157,106 @@ test_expect_success 'want-ref with ref we already have commit for' '
|
|||
check_output
|
||||
'
|
||||
|
||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||
start_httpd
|
||||
|
||||
REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
|
||||
LOCAL_PRISTINE="$(pwd)/local_pristine"
|
||||
|
||||
test_expect_success 'setup repos for change-while-negotiating test' '
|
||||
(
|
||||
git init "$REPO" &&
|
||||
cd "$REPO" &&
|
||||
>.git/git-daemon-export-ok &&
|
||||
test_commit m1 &&
|
||||
git tag -d m1 &&
|
||||
|
||||
# Local repo with many commits (so that negotiation will take
|
||||
# more than 1 request/response pair)
|
||||
git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
|
||||
cd "$LOCAL_PRISTINE" &&
|
||||
git checkout -b side &&
|
||||
test_commit_bulk --id=s 33 &&
|
||||
|
||||
# Add novel commits to upstream
|
||||
git checkout master &&
|
||||
cd "$REPO" &&
|
||||
test_commit m2 &&
|
||||
test_commit m3 &&
|
||||
git tag -d m2 m3
|
||||
) &&
|
||||
git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
|
||||
git -C "$LOCAL_PRISTINE" config protocol.version 2
|
||||
'
|
||||
|
||||
inconsistency () {
|
||||
# Simulate that the server initially reports $2 as the ref
|
||||
# corresponding to $1, and after that, $1 as the ref corresponding to
|
||||
# $1. This corresponds to the real-life situation where the server's
|
||||
# repository appears to change during negotiation, for example, when
|
||||
# different servers in a load-balancing arrangement serve (stateless)
|
||||
# RPCs during a single negotiation.
|
||||
printf "s/%s/%s/" \
|
||||
$(git -C "$REPO" rev-parse $1 | tr -d "\n") \
|
||||
$(git -C "$REPO" rev-parse $2 | tr -d "\n") \
|
||||
>"$HTTPD_ROOT_PATH/one-time-sed"
|
||||
}
|
||||
|
||||
test_expect_success 'server is initially ahead - no ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant false &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master 1234567890123456789012345678901234567890 &&
|
||||
test_must_fail git -C local fetch 2>err &&
|
||||
test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially ahead - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master 1234567890123456789012345678901234567890 &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify master >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially behind - no ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant false &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master "master^" &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify "master^" >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially behind - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master "master^" &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify "master" >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server loses a ref - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
|
||||
test_must_fail git -C local fetch 2>err &&
|
||||
|
||||
test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
|
||||
'
|
||||
|
||||
REPO="$(pwd)/repo"
|
||||
LOCAL_PRISTINE="$(pwd)/local_pristine"
|
||||
|
||||
|
|
@ -222,14 +311,13 @@ test_expect_success 'fetching with exact OID' '
|
|||
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
oid=$(git -C "$REPO" rev-parse d) &&
|
||||
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
|
||||
"$oid":refs/heads/actual &&
|
||||
$(git -C "$REPO" rev-parse d):refs/heads/actual &&
|
||||
|
||||
git -C "$REPO" rev-parse "d" >expected &&
|
||||
git -C local rev-parse refs/heads/actual >actual &&
|
||||
test_cmp expected actual &&
|
||||
grep "want $oid" log
|
||||
grep "want $(git -C "$REPO" rev-parse d)" log
|
||||
'
|
||||
|
||||
test_expect_success 'fetching multiple refs' '
|
||||
|
|
@ -251,14 +339,13 @@ test_expect_success 'fetching ref and exact OID' '
|
|||
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
oid=$(git -C "$REPO" rev-parse b) &&
|
||||
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
|
||||
master "$oid":refs/heads/actual &&
|
||||
master $(git -C "$REPO" rev-parse b):refs/heads/actual &&
|
||||
|
||||
git -C "$REPO" rev-parse "master" "b" >expected &&
|
||||
git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual &&
|
||||
test_cmp expected actual &&
|
||||
grep "want $oid" log &&
|
||||
grep "want $(git -C "$REPO" rev-parse b)" log &&
|
||||
grep "want-ref refs/heads/master" log
|
||||
'
|
||||
|
||||
|
|
@ -285,107 +372,4 @@ test_expect_success 'fetching with wildcard that matches multiple refs' '
|
|||
grep "want-ref refs/heads/o/bar" log
|
||||
'
|
||||
|
||||
. "$TEST_DIRECTORY"/lib-httpd.sh
|
||||
start_httpd
|
||||
|
||||
REPO="$HTTPD_DOCUMENT_ROOT_PATH/repo"
|
||||
LOCAL_PRISTINE="$(pwd)/local_pristine"
|
||||
|
||||
test_expect_success 'setup repos for change-while-negotiating test' '
|
||||
(
|
||||
git init "$REPO" &&
|
||||
cd "$REPO" &&
|
||||
>.git/git-daemon-export-ok &&
|
||||
test_commit m1 &&
|
||||
git tag -d m1 &&
|
||||
|
||||
# Local repo with many commits (so that negotiation will take
|
||||
# more than 1 request/response pair)
|
||||
rm -rf "$LOCAL_PRISTINE" &&
|
||||
git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
|
||||
cd "$LOCAL_PRISTINE" &&
|
||||
git checkout -b side &&
|
||||
test_commit_bulk --id=s 33 &&
|
||||
|
||||
# Add novel commits to upstream
|
||||
git checkout master &&
|
||||
cd "$REPO" &&
|
||||
test_commit m2 &&
|
||||
test_commit m3 &&
|
||||
git tag -d m2 m3
|
||||
) &&
|
||||
git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_perl/repo" &&
|
||||
git -C "$LOCAL_PRISTINE" config protocol.version 2
|
||||
'
|
||||
|
||||
inconsistency () {
|
||||
# Simulate that the server initially reports $2 as the ref
|
||||
# corresponding to $1, and after that, $1 as the ref corresponding to
|
||||
# $1. This corresponds to the real-life situation where the server's
|
||||
# repository appears to change during negotiation, for example, when
|
||||
# different servers in a load-balancing arrangement serve (stateless)
|
||||
# RPCs during a single negotiation.
|
||||
oid1=$(git -C "$REPO" rev-parse $1) &&
|
||||
oid2=$(git -C "$REPO" rev-parse $2) &&
|
||||
echo "s/$oid1/$oid2/" >"$HTTPD_ROOT_PATH/one-time-perl"
|
||||
}
|
||||
|
||||
test_expect_success 'server is initially ahead - no ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant false &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master $(test_oid numeric) &&
|
||||
test_must_fail git -C local fetch 2>err &&
|
||||
test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially ahead - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master $(test_oid numeric) &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify master >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially behind - no ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant false &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master "master^" &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify "master^" >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server is initially behind - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
inconsistency master "master^" &&
|
||||
git -C local fetch &&
|
||||
|
||||
git -C "$REPO" rev-parse --verify "master" >expected &&
|
||||
git -C local rev-parse --verify refs/remotes/origin/master >actual &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
||||
test_expect_success 'server loses a ref - ref in want' '
|
||||
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
||||
rm -rf local &&
|
||||
cp -r "$LOCAL_PRISTINE" local &&
|
||||
echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
|
||||
test_must_fail git -C local fetch 2>err &&
|
||||
|
||||
test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
|
||||
'
|
||||
|
||||
# DO NOT add non-httpd-specific tests here, because the last part of this
|
||||
# test script is only executed when httpd is available and enabled.
|
||||
|
||||
test_done
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue