3 test_description
='upload-pack ref-in-want'
8 sed -n -e '/wanted-refs/,/0001/{
12 }' <out | test-tool pkt-line unpack
>actual_refs
15 get_actual_commits
() {
16 sed -n -e '/packfile/,/0000/{
19 }' <out | test-tool pkt-line unpack-sideband
>o.pack
&&
20 git index-pack o.pack
&&
21 git verify-pack
-v o.idx |
grep commit | cut
-c-40 |
sort >actual_commits
26 test_cmp expected_refs actual_refs
&&
28 test_cmp expected_commits actual_commits
37 test_expect_success
'setup repository' '
39 git checkout -b o/foo &&
42 git checkout -b o/bar b &&
44 git checkout -b baz a &&
46 git checkout master &&
50 test_expect_success
'config controls ref-in-want advertisement' '
51 test-tool serve-v2 --advertise-capabilities >out &&
52 ! grep -a ref-in-want out &&
54 git config uploadpack.allowRefInWant false &&
55 test-tool serve-v2 --advertise-capabilities >out &&
56 ! grep -a ref-in-want out &&
58 git config uploadpack.allowRefInWant true &&
59 test-tool serve-v2 --advertise-capabilities >out &&
60 grep -a ref-in-want out
63 test_expect_success
'invalid want-ref line' '
64 test-tool pkt-line pack >in <<-EOF &&
68 want-ref refs/heads/non-existent
73 test_must_fail test-tool serve-v2 --stateless-rpc 2>out <in &&
74 grep "unknown ref" out
77 test_expect_success
'basic want-ref' '
78 cat >expected_refs <<-EOF &&
79 $(git rev-parse f) refs/heads/master
81 git rev-parse f | sort >expected_commits &&
83 test-tool pkt-line pack >in <<-EOF &&
87 want-ref refs/heads/master
88 have $(git rev-parse a)
93 test-tool serve-v2 --stateless-rpc >out <in &&
97 test_expect_success
'multiple want-ref lines' '
98 cat >expected_refs <<-EOF &&
99 $(git rev-parse c) refs/heads/o/foo
100 $(git rev-parse d) refs/heads/o/bar
102 git rev-parse c d | sort >expected_commits &&
104 test-tool pkt-line pack >in <<-EOF &&
108 want-ref refs/heads/o/foo
109 want-ref refs/heads/o/bar
110 have $(git rev-parse b)
115 test-tool serve-v2 --stateless-rpc >out <in &&
119 test_expect_success
'mix want and want-ref' '
120 cat >expected_refs <<-EOF &&
121 $(git rev-parse f) refs/heads/master
123 git rev-parse e f | sort >expected_commits &&
125 test-tool pkt-line pack >in <<-EOF &&
129 want-ref refs/heads/master
130 want $(git rev-parse e)
131 have $(git rev-parse a)
136 test-tool serve-v2 --stateless-rpc >out <in &&
140 test_expect_success
'want-ref with ref we already have commit for' '
141 cat >expected_refs <<-EOF &&
142 $(git rev-parse c) refs/heads/o/foo
146 test-tool pkt-line pack >in <<-EOF &&
150 want-ref refs/heads/o/foo
151 have $(git rev-parse c)
156 test-tool serve-v2 --stateless-rpc >out <in &&
161 LOCAL_PRISTINE
="$(pwd)/local_pristine"
178 test_expect_success
'setup repos for fetching with ref-in-want tests' '
184 # Local repo with many commits (so that negotiation will take
185 # more than 1 request/response pair)
186 rm -rf "$LOCAL_PRISTINE" &&
187 git clone "file://$REPO" "$LOCAL_PRISTINE" &&
188 cd "$LOCAL_PRISTINE" &&
189 git checkout -b side &&
190 test_commit_bulk --id=s 33 &&
192 # Add novel commits to upstream
193 git checkout master &&
195 git checkout -b o/foo &&
198 git checkout -b o/bar b &&
200 git checkout -b baz a &&
202 git checkout master &&
205 git -C "$REPO" config uploadpack.allowRefInWant true &&
206 git -C "$LOCAL_PRISTINE" config protocol.version 2
209 test_expect_success
'fetching with exact OID' '
210 test_when_finished "rm -f log" &&
213 cp -r "$LOCAL_PRISTINE" local &&
214 GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
215 $(git -C "$REPO" rev-parse d):refs/heads/actual &&
217 git -C "$REPO" rev-parse "d" >expected &&
218 git -C local rev-parse refs/heads/actual >actual &&
219 test_cmp expected actual &&
220 grep "want $(git -C "$REPO" rev-parse d)" log
223 test_expect_success
'fetching multiple refs' '
224 test_when_finished "rm -f log" &&
227 cp -r "$LOCAL_PRISTINE" local &&
228 GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin master baz &&
230 git -C "$REPO" rev-parse "master" "baz" >expected &&
231 git -C local rev-parse refs/remotes/origin/master refs/remotes/origin/baz >actual &&
232 test_cmp expected actual &&
233 grep "want-ref refs/heads/master" log &&
234 grep "want-ref refs/heads/baz" log
237 test_expect_success
'fetching ref and exact OID' '
238 test_when_finished "rm -f log" &&
241 cp -r "$LOCAL_PRISTINE" local &&
242 GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
243 master $(git -C "$REPO" rev-parse b):refs/heads/actual &&
245 git -C "$REPO" rev-parse "master" "b" >expected &&
246 git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual &&
247 test_cmp expected actual &&
248 grep "want $(git -C "$REPO" rev-parse b)" log &&
249 grep "want-ref refs/heads/master" log
252 test_expect_success
'fetching with wildcard that does not match any refs' '
253 test_when_finished "rm -f log" &&
256 cp -r "$LOCAL_PRISTINE" local &&
257 git -C local fetch origin refs/heads/none*:refs/heads/* >out &&
258 test_must_be_empty out
261 test_expect_success
'fetching with wildcard that matches multiple refs' '
262 test_when_finished "rm -f log" &&
265 cp -r "$LOCAL_PRISTINE" local &&
266 GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin refs/heads/o*:refs/heads/o* &&
268 git -C "$REPO" rev-parse "o/foo" "o/bar" >expected &&
269 git -C local rev-parse "o/foo" "o/bar" >actual &&
270 test_cmp expected actual &&
271 grep "want-ref refs/heads/o/foo" log &&
272 grep "want-ref refs/heads/o/bar" log
275 .
"$TEST_DIRECTORY"/lib-httpd.sh
278 REPO
="$HTTPD_DOCUMENT_ROOT_PATH/repo"
279 LOCAL_PRISTINE
="$(pwd)/local_pristine"
281 test_expect_success
'setup repos for change-while-negotiating test' '
285 >.git/git-daemon-export-ok &&
289 # Local repo with many commits (so that negotiation will take
290 # more than 1 request/response pair)
291 rm -rf "$LOCAL_PRISTINE" &&
292 git clone "http://127.0.0.1:$LIB_HTTPD_PORT/smart/repo" "$LOCAL_PRISTINE" &&
293 cd "$LOCAL_PRISTINE" &&
294 git checkout -b side &&
295 test_commit_bulk --id=s 33 &&
297 # Add novel commits to upstream
298 git checkout master &&
304 git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
305 git -C "$LOCAL_PRISTINE" config protocol.version 2
309 # Simulate that the server initially reports $2 as the ref
310 # corresponding to $1, and after that, $1 as the ref corresponding to
311 # $1. This corresponds to the real-life situation where the server's
312 # repository appears to change during negotiation, for example, when
313 # different servers in a load-balancing arrangement serve (stateless)
314 # RPCs during a single negotiation.
316 $
(git
-C "$REPO" rev-parse
$1 |
tr -d "\n") \
317 $
(git
-C "$REPO" rev-parse
$2 |
tr -d "\n") \
318 >"$HTTPD_ROOT_PATH/one-time-sed"
321 test_expect_success
'server is initially ahead - no ref in want' '
322 git -C "$REPO" config uploadpack.allowRefInWant false &&
324 cp -r "$LOCAL_PRISTINE" local &&
325 inconsistency master 1234567890123456789012345678901234567890 &&
326 test_must_fail git -C local fetch 2>err &&
327 test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
330 test_expect_success
'server is initially ahead - ref in want' '
331 git -C "$REPO" config uploadpack.allowRefInWant true &&
333 cp -r "$LOCAL_PRISTINE" local &&
334 inconsistency master 1234567890123456789012345678901234567890 &&
335 git -C local fetch &&
337 git -C "$REPO" rev-parse --verify master >expected &&
338 git -C local rev-parse --verify refs/remotes/origin/master >actual &&
339 test_cmp expected actual
342 test_expect_success
'server is initially behind - no ref in want' '
343 git -C "$REPO" config uploadpack.allowRefInWant false &&
345 cp -r "$LOCAL_PRISTINE" local &&
346 inconsistency master "master^" &&
347 git -C local fetch &&
349 git -C "$REPO" rev-parse --verify "master^" >expected &&
350 git -C local rev-parse --verify refs/remotes/origin/master >actual &&
351 test_cmp expected actual
354 test_expect_success
'server is initially behind - ref in want' '
355 git -C "$REPO" config uploadpack.allowRefInWant true &&
357 cp -r "$LOCAL_PRISTINE" local &&
358 inconsistency master "master^" &&
359 git -C local fetch &&
361 git -C "$REPO" rev-parse --verify "master" >expected &&
362 git -C local rev-parse --verify refs/remotes/origin/master >actual &&
363 test_cmp expected actual
366 test_expect_success
'server loses a ref - ref in want' '
367 git -C "$REPO" config uploadpack.allowRefInWant true &&
369 cp -r "$LOCAL_PRISTINE" local &&
370 echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
371 test_must_fail git -C local fetch 2>err &&
373 test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
376 # DO NOT add non-httpd-specific tests here, because the last part of this
377 # test script is only executed when httpd is available and enabled.