mirror of
https://github.com/git/git.git
synced 2024-11-25 10:54:00 +08:00
733020517a
Implement ref-in-want on the client side so that when a server supports the "ref-in-want" feature, a client will send "want-ref" lines for each reference the client wants to fetch. This feature allows clients to tolerate inconsistencies that exist when a remote repository's refs change during the course of negotiation. This allows a client to request to request a particular ref without specifying the OID of the ref. This means that instead of hitting an error when a ref no longer points at the OID it did at the beginning of negotiation, negotiation can continue and the value of that ref will be sent at the termination of negotiation, just before a packfile is sent. More information on the ref-in-want feature can be found in Documentation/technical/protocol-v2.txt. Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
378 lines
9.4 KiB
Bash
Executable File
378 lines
9.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='upload-pack ref-in-want'
|
|
|
|
. ./test-lib.sh
|
|
|
|
get_actual_refs () {
|
|
sed -n -e '/wanted-refs/,/0001/{
|
|
/wanted-refs/d
|
|
/0001/d
|
|
p
|
|
}' <out | test-pkt-line unpack >actual_refs
|
|
}
|
|
|
|
get_actual_commits () {
|
|
sed -n -e '/packfile/,/0000/{
|
|
/packfile/d
|
|
p
|
|
}' <out | test-pkt-line unpack-sideband >o.pack &&
|
|
git index-pack o.pack &&
|
|
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 &&
|
|
test_cmp expected_commits actual_commits
|
|
}
|
|
|
|
# c(o/foo) d(o/bar)
|
|
# \ /
|
|
# b e(baz) f(master)
|
|
# \__ | __/
|
|
# \ | /
|
|
# a
|
|
test_expect_success 'setup repository' '
|
|
test_commit a &&
|
|
git checkout -b o/foo &&
|
|
test_commit b &&
|
|
test_commit c &&
|
|
git checkout -b o/bar b &&
|
|
test_commit d &&
|
|
git checkout -b baz a &&
|
|
test_commit e &&
|
|
git checkout master &&
|
|
test_commit f
|
|
'
|
|
|
|
test_expect_success 'config controls ref-in-want advertisement' '
|
|
git serve --advertise-capabilities >out &&
|
|
! grep -a ref-in-want out &&
|
|
|
|
git config uploadpack.allowRefInWant false &&
|
|
git serve --advertise-capabilities >out &&
|
|
! grep -a ref-in-want out &&
|
|
|
|
git config uploadpack.allowRefInWant true &&
|
|
git serve --advertise-capabilities >out &&
|
|
grep -a ref-in-want out
|
|
'
|
|
|
|
test_expect_success 'invalid want-ref line' '
|
|
test-pkt-line pack >in <<-EOF &&
|
|
command=fetch
|
|
0001
|
|
no-progress
|
|
want-ref refs/heads/non-existent
|
|
done
|
|
0000
|
|
EOF
|
|
|
|
test_must_fail git serve --stateless-rpc 2>out <in &&
|
|
grep "unknown ref" out
|
|
'
|
|
|
|
test_expect_success 'basic want-ref' '
|
|
cat >expected_refs <<-EOF &&
|
|
$(git rev-parse f) refs/heads/master
|
|
EOF
|
|
git rev-parse f | sort >expected_commits &&
|
|
|
|
test-pkt-line pack >in <<-EOF &&
|
|
command=fetch
|
|
0001
|
|
no-progress
|
|
want-ref refs/heads/master
|
|
have $(git rev-parse a)
|
|
done
|
|
0000
|
|
EOF
|
|
|
|
git serve --stateless-rpc >out <in &&
|
|
check_output
|
|
'
|
|
|
|
test_expect_success 'multiple want-ref lines' '
|
|
cat >expected_refs <<-EOF &&
|
|
$(git rev-parse c) refs/heads/o/foo
|
|
$(git rev-parse d) refs/heads/o/bar
|
|
EOF
|
|
git rev-parse c d | sort >expected_commits &&
|
|
|
|
test-pkt-line pack >in <<-EOF &&
|
|
command=fetch
|
|
0001
|
|
no-progress
|
|
want-ref refs/heads/o/foo
|
|
want-ref refs/heads/o/bar
|
|
have $(git rev-parse b)
|
|
done
|
|
0000
|
|
EOF
|
|
|
|
git serve --stateless-rpc >out <in &&
|
|
check_output
|
|
'
|
|
|
|
test_expect_success 'mix want and want-ref' '
|
|
cat >expected_refs <<-EOF &&
|
|
$(git rev-parse f) refs/heads/master
|
|
EOF
|
|
git rev-parse e f | sort >expected_commits &&
|
|
|
|
test-pkt-line pack >in <<-EOF &&
|
|
command=fetch
|
|
0001
|
|
no-progress
|
|
want-ref refs/heads/master
|
|
want $(git rev-parse e)
|
|
have $(git rev-parse a)
|
|
done
|
|
0000
|
|
EOF
|
|
|
|
git serve --stateless-rpc >out <in &&
|
|
check_output
|
|
'
|
|
|
|
test_expect_success 'want-ref with ref we already have commit for' '
|
|
cat >expected_refs <<-EOF &&
|
|
$(git rev-parse c) refs/heads/o/foo
|
|
EOF
|
|
>expected_commits &&
|
|
|
|
test-pkt-line pack >in <<-EOF &&
|
|
command=fetch
|
|
0001
|
|
no-progress
|
|
want-ref refs/heads/o/foo
|
|
have $(git rev-parse c)
|
|
done
|
|
0000
|
|
EOF
|
|
|
|
git serve --stateless-rpc >out <in &&
|
|
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 &&
|
|
for i in $(seq 1 33); do test_commit s$i; done &&
|
|
|
|
# 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 &&
|
|
grep "ERR 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 &&
|
|
|
|
grep "ERR unknown ref refs/heads/raster" err
|
|
'
|
|
|
|
stop_httpd
|
|
|
|
REPO="$(pwd)/repo"
|
|
LOCAL_PRISTINE="$(pwd)/local_pristine"
|
|
|
|
# $REPO
|
|
# c(o/foo) d(o/bar)
|
|
# \ /
|
|
# b e(baz) f(master)
|
|
# \__ | __/
|
|
# \ | /
|
|
# a
|
|
#
|
|
# $LOCAL_PRISTINE
|
|
# s32(side)
|
|
# |
|
|
# .
|
|
# .
|
|
# |
|
|
# a(master)
|
|
test_expect_success 'setup repos for fetching with ref-in-want tests' '
|
|
(
|
|
git init "$REPO" &&
|
|
cd "$REPO" &&
|
|
test_commit a &&
|
|
|
|
# Local repo with many commits (so that negotiation will take
|
|
# more than 1 request/response pair)
|
|
rm -rf "$LOCAL_PRISTINE" &&
|
|
git clone "file://$REPO" "$LOCAL_PRISTINE" &&
|
|
cd "$LOCAL_PRISTINE" &&
|
|
git checkout -b side &&
|
|
for i in $(seq 1 33); do test_commit s$i; done &&
|
|
|
|
# Add novel commits to upstream
|
|
git checkout master &&
|
|
cd "$REPO" &&
|
|
git checkout -b o/foo &&
|
|
test_commit b &&
|
|
test_commit c &&
|
|
git checkout -b o/bar b &&
|
|
test_commit d &&
|
|
git checkout -b baz a &&
|
|
test_commit e &&
|
|
git checkout master &&
|
|
test_commit f
|
|
) &&
|
|
git -C "$REPO" config uploadpack.allowRefInWant true &&
|
|
git -C "$LOCAL_PRISTINE" config protocol.version 2
|
|
'
|
|
|
|
test_expect_success 'fetching with exact OID' '
|
|
test_when_finished "rm -f log" &&
|
|
|
|
rm -rf local &&
|
|
cp -r "$LOCAL_PRISTINE" local &&
|
|
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
|
|
$(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 $(git -C "$REPO" rev-parse d)" log
|
|
'
|
|
|
|
test_expect_success 'fetching multiple refs' '
|
|
test_when_finished "rm -f log" &&
|
|
|
|
rm -rf local &&
|
|
cp -r "$LOCAL_PRISTINE" local &&
|
|
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin master baz &&
|
|
|
|
git -C "$REPO" rev-parse "master" "baz" >expected &&
|
|
git -C local rev-parse refs/remotes/origin/master refs/remotes/origin/baz >actual &&
|
|
test_cmp expected actual &&
|
|
grep "want-ref refs/heads/master" log &&
|
|
grep "want-ref refs/heads/baz" log
|
|
'
|
|
|
|
test_expect_success 'fetching ref and exact OID' '
|
|
test_when_finished "rm -f log" &&
|
|
|
|
rm -rf local &&
|
|
cp -r "$LOCAL_PRISTINE" local &&
|
|
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
|
|
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 $(git -C "$REPO" rev-parse b)" log &&
|
|
grep "want-ref refs/heads/master" log
|
|
'
|
|
|
|
test_expect_success 'fetching with wildcard that does not match any refs' '
|
|
test_when_finished "rm -f log" &&
|
|
|
|
rm -rf local &&
|
|
cp -r "$LOCAL_PRISTINE" local &&
|
|
git -C local fetch origin refs/heads/none*:refs/heads/* >out &&
|
|
test_must_be_empty out
|
|
'
|
|
|
|
test_expect_success 'fetching with wildcard that matches multiple refs' '
|
|
test_when_finished "rm -f log" &&
|
|
|
|
rm -rf local &&
|
|
cp -r "$LOCAL_PRISTINE" local &&
|
|
GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin refs/heads/o*:refs/heads/o* &&
|
|
|
|
git -C "$REPO" rev-parse "o/foo" "o/bar" >expected &&
|
|
git -C local rev-parse "o/foo" "o/bar" >actual &&
|
|
test_cmp expected actual &&
|
|
grep "want-ref refs/heads/o/foo" log &&
|
|
grep "want-ref refs/heads/o/bar" log
|
|
'
|
|
|
|
test_done
|