]>
Commit | Line | Data |
---|---|---|
e52449b6 BW |
1 | #!/bin/sh |
2 | ||
3 | test_description='test git wire-protocol version 2' | |
4 | ||
5 | TEST_NO_CREATE_REPO=1 | |
6 | ||
7 | . ./test-lib.sh | |
8 | ||
9 | # Test protocol v2 with 'git://' transport | |
10 | # | |
11 | . "$TEST_DIRECTORY"/lib-git-daemon.sh | |
12 | start_git_daemon --export-all --enable=receive-pack | |
13 | daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent | |
14 | ||
15 | test_expect_success 'create repo to be served by git-daemon' ' | |
16 | git init "$daemon_parent" && | |
17 | test_commit -C "$daemon_parent" one | |
18 | ' | |
19 | ||
20 | test_expect_success 'list refs with git:// using protocol v2' ' | |
21 | test_when_finished "rm -f log" && | |
22 | ||
23 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
24 | ls-remote --symref "$GIT_DAEMON_URL/parent" >actual && | |
25 | ||
26 | # Client requested to use protocol v2 | |
27 | grep "git> .*\\\0\\\0version=2\\\0$" log && | |
28 | # Server responded using protocol v2 | |
29 | grep "git< version 2" log && | |
30 | ||
31 | git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect && | |
dcbaa0b3 | 32 | test_cmp expect actual |
e52449b6 BW |
33 | ' |
34 | ||
b4be7410 BW |
35 | test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' ' |
36 | test_when_finished "rm -f log" && | |
37 | ||
38 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
39 | ls-remote "$GIT_DAEMON_URL/parent" master >actual && | |
40 | ||
41 | cat >expect <<-EOF && | |
42 | $(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master | |
43 | EOF | |
44 | ||
dcbaa0b3 | 45 | test_cmp expect actual |
b4be7410 BW |
46 | ' |
47 | ||
685fbd32 BW |
48 | test_expect_success 'clone with git:// using protocol v2' ' |
49 | test_when_finished "rm -f log" && | |
50 | ||
51 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
52 | clone "$GIT_DAEMON_URL/parent" daemon_child && | |
53 | ||
54 | git -C daemon_child log -1 --format=%s >actual && | |
55 | git -C "$daemon_parent" log -1 --format=%s >expect && | |
56 | test_cmp expect actual && | |
57 | ||
58 | # Client requested to use protocol v2 | |
59 | grep "clone> .*\\\0\\\0version=2\\\0$" log && | |
60 | # Server responded using protocol v2 | |
61 | grep "clone< version 2" log | |
62 | ' | |
63 | ||
64 | test_expect_success 'fetch with git:// using protocol v2' ' | |
65 | test_when_finished "rm -f log" && | |
66 | ||
67 | test_commit -C "$daemon_parent" two && | |
68 | ||
69 | GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \ | |
70 | fetch && | |
71 | ||
72 | git -C daemon_child log -1 --format=%s origin/master >actual && | |
73 | git -C "$daemon_parent" log -1 --format=%s >expect && | |
74 | test_cmp expect actual && | |
75 | ||
76 | # Client requested to use protocol v2 | |
77 | grep "fetch> .*\\\0\\\0version=2\\\0$" log && | |
78 | # Server responded using protocol v2 | |
79 | grep "fetch< version 2" log | |
80 | ' | |
81 | ||
e70a3030 JT |
82 | test_expect_success 'fetch by hash without tag following with protocol v2 does not list refs' ' |
83 | test_when_finished "rm -f log" && | |
84 | ||
85 | test_commit -C "$daemon_parent" two_a && | |
86 | git -C "$daemon_parent" rev-parse two_a >two_a_hash && | |
87 | ||
88 | GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \ | |
89 | fetch --no-tags origin $(cat two_a_hash) && | |
90 | ||
91 | grep "fetch< version 2" log && | |
92 | ! grep "fetch> command=ls-refs" log | |
93 | ' | |
94 | ||
685fbd32 BW |
95 | test_expect_success 'pull with git:// using protocol v2' ' |
96 | test_when_finished "rm -f log" && | |
97 | ||
98 | GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \ | |
99 | pull && | |
100 | ||
101 | git -C daemon_child log -1 --format=%s >actual && | |
102 | git -C "$daemon_parent" log -1 --format=%s >expect && | |
103 | test_cmp expect actual && | |
104 | ||
105 | # Client requested to use protocol v2 | |
106 | grep "fetch> .*\\\0\\\0version=2\\\0$" log && | |
107 | # Server responded using protocol v2 | |
108 | grep "fetch< version 2" log | |
109 | ' | |
110 | ||
1aa8dded BW |
111 | test_expect_success 'push with git:// and a config of v2 does not request v2' ' |
112 | test_when_finished "rm -f log" && | |
113 | ||
114 | # Till v2 for push is designed, make sure that if a client has | |
115 | # protocol.version configured to use v2, that the client instead falls | |
116 | # back and uses v0. | |
117 | ||
118 | test_commit -C daemon_child three && | |
119 | ||
120 | # Push to another branch, as the target repository has the | |
121 | # master branch checked out and we cannot push into it. | |
122 | GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \ | |
123 | push origin HEAD:client_branch && | |
124 | ||
125 | git -C daemon_child log -1 --format=%s >actual && | |
126 | git -C "$daemon_parent" log -1 --format=%s client_branch >expect && | |
127 | test_cmp expect actual && | |
128 | ||
129 | # Client requested to use protocol v2 | |
130 | ! grep "push> .*\\\0\\\0version=2\\\0$" log && | |
131 | # Server responded using protocol v2 | |
132 | ! grep "push< version 2" log | |
133 | ' | |
134 | ||
e52449b6 BW |
135 | stop_git_daemon |
136 | ||
137 | # Test protocol v2 with 'file://' transport | |
138 | # | |
139 | test_expect_success 'create repo to be served by file:// transport' ' | |
140 | git init file_parent && | |
141 | test_commit -C file_parent one | |
142 | ' | |
143 | ||
144 | test_expect_success 'list refs with file:// using protocol v2' ' | |
145 | test_when_finished "rm -f log" && | |
146 | ||
147 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
148 | ls-remote --symref "file://$(pwd)/file_parent" >actual && | |
149 | ||
150 | # Server responded using protocol v2 | |
151 | grep "git< version 2" log && | |
152 | ||
153 | git ls-remote --symref "file://$(pwd)/file_parent" >expect && | |
dcbaa0b3 | 154 | test_cmp expect actual |
e52449b6 BW |
155 | ' |
156 | ||
b4be7410 BW |
157 | test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' ' |
158 | test_when_finished "rm -f log" && | |
159 | ||
160 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
161 | ls-remote "file://$(pwd)/file_parent" master >actual && | |
162 | ||
163 | cat >expect <<-EOF && | |
164 | $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master | |
165 | EOF | |
166 | ||
dcbaa0b3 | 167 | test_cmp expect actual |
b4be7410 BW |
168 | ' |
169 | ||
ff473221 BW |
170 | test_expect_success 'server-options are sent when using ls-remote' ' |
171 | test_when_finished "rm -f log" && | |
172 | ||
173 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
174 | ls-remote -o hello -o world "file://$(pwd)/file_parent" master >actual && | |
175 | ||
176 | cat >expect <<-EOF && | |
177 | $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master | |
178 | EOF | |
179 | ||
dcbaa0b3 | 180 | test_cmp expect actual && |
ff473221 BW |
181 | grep "server-option=hello" log && |
182 | grep "server-option=world" log | |
183 | ' | |
184 | ||
185 | ||
685fbd32 BW |
186 | test_expect_success 'clone with file:// using protocol v2' ' |
187 | test_when_finished "rm -f log" && | |
188 | ||
189 | GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \ | |
190 | clone "file://$(pwd)/file_parent" file_child && | |
191 | ||
192 | git -C file_child log -1 --format=%s >actual && | |
193 | git -C file_parent log -1 --format=%s >expect && | |
194 | test_cmp expect actual && | |
195 | ||
196 | # Server responded using protocol v2 | |
402c47d9 BW |
197 | grep "clone< version 2" log && |
198 | ||
199 | # Client sent ref-prefixes to filter the ref-advertisement | |
200 | grep "ref-prefix HEAD" log && | |
201 | grep "ref-prefix refs/heads/" log && | |
202 | grep "ref-prefix refs/tags/" log | |
685fbd32 BW |
203 | ' |
204 | ||
205 | test_expect_success 'fetch with file:// using protocol v2' ' | |
206 | test_when_finished "rm -f log" && | |
207 | ||
208 | test_commit -C file_parent two && | |
209 | ||
210 | GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \ | |
211 | fetch origin && | |
212 | ||
213 | git -C file_child log -1 --format=%s origin/master >actual && | |
214 | git -C file_parent log -1 --format=%s >expect && | |
215 | test_cmp expect actual && | |
216 | ||
217 | # Server responded using protocol v2 | |
218 | grep "fetch< version 2" log | |
219 | ' | |
220 | ||
221 | test_expect_success 'ref advertisment is filtered during fetch using protocol v2' ' | |
222 | test_when_finished "rm -f log" && | |
223 | ||
224 | test_commit -C file_parent three && | |
2b554353 | 225 | git -C file_parent branch unwanted-branch three && |
685fbd32 BW |
226 | |
227 | GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \ | |
228 | fetch origin master && | |
229 | ||
230 | git -C file_child log -1 --format=%s origin/master >actual && | |
231 | git -C file_parent log -1 --format=%s >expect && | |
232 | test_cmp expect actual && | |
233 | ||
2b554353 JT |
234 | grep "refs/heads/master" log && |
235 | ! grep "refs/heads/unwanted-branch" log | |
685fbd32 BW |
236 | ' |
237 | ||
5e3548ef BW |
238 | test_expect_success 'server-options are sent when fetching' ' |
239 | test_when_finished "rm -f log" && | |
240 | ||
241 | test_commit -C file_parent four && | |
242 | ||
243 | GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \ | |
244 | fetch -o hello -o world origin master && | |
245 | ||
246 | git -C file_child log -1 --format=%s origin/master >actual && | |
247 | git -C file_parent log -1 --format=%s >expect && | |
248 | test_cmp expect actual && | |
249 | ||
250 | grep "server-option=hello" log && | |
251 | grep "server-option=world" log | |
252 | ' | |
253 | ||
54592687 JT |
254 | test_expect_success 'upload-pack respects config using protocol v2' ' |
255 | git init server && | |
256 | write_script server/.git/hook <<-\EOF && | |
257 | touch hookout | |
258 | "$@" | |
259 | EOF | |
260 | test_commit -C server one && | |
261 | ||
262 | test_config_global uploadpack.packobjectshook ./hook && | |
263 | test_path_is_missing server/.git/hookout && | |
264 | git -c protocol.version=2 clone "file://$(pwd)/server" client && | |
265 | test_path_is_file server/.git/hookout | |
266 | ' | |
267 | ||
ba95710a JT |
268 | test_expect_success 'setup filter tests' ' |
269 | rm -rf server client && | |
270 | git init server && | |
271 | ||
272 | # 1 commit to create a file, and 1 commit to modify it | |
273 | test_commit -C server message1 a.txt && | |
274 | test_commit -C server message2 a.txt && | |
275 | git -C server config protocol.version 2 && | |
276 | git -C server config uploadpack.allowfilter 1 && | |
277 | git -C server config uploadpack.allowanysha1inwant 1 && | |
278 | git -C server config protocol.version 2 | |
279 | ' | |
280 | ||
281 | test_expect_success 'partial clone' ' | |
282 | GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \ | |
283 | clone --filter=blob:none "file://$(pwd)/server" client && | |
284 | grep "version 2" trace && | |
285 | ||
286 | # Ensure that the old version of the file is missing | |
8d6ba495 | 287 | git -C client rev-list --quiet --objects --missing=print master \ |
ba95710a JT |
288 | >observed.oids && |
289 | grep "$(git -C server rev-parse message1:a.txt)" observed.oids && | |
290 | ||
291 | # Ensure that client passes fsck | |
292 | git -C client fsck | |
293 | ' | |
294 | ||
295 | test_expect_success 'dynamically fetch missing object' ' | |
296 | rm "$(pwd)/trace" && | |
297 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ | |
298 | cat-file -p $(git -C server rev-parse message1:a.txt) && | |
299 | grep "version 2" trace | |
300 | ' | |
301 | ||
01775651 JT |
302 | test_expect_success 'when dynamically fetching missing object, do not list refs' ' |
303 | ! grep "git> command=ls-refs" trace | |
304 | ' | |
305 | ||
ba95710a JT |
306 | test_expect_success 'partial fetch' ' |
307 | rm -rf client "$(pwd)/trace" && | |
308 | git init client && | |
309 | SERVER="file://$(pwd)/server" && | |
310 | test_config -C client extensions.partialClone "$SERVER" && | |
311 | ||
312 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ | |
313 | fetch --filter=blob:none "$SERVER" master:refs/heads/other && | |
314 | grep "version 2" trace && | |
315 | ||
316 | # Ensure that the old version of the file is missing | |
8d6ba495 | 317 | git -C client rev-list --quiet --objects --missing=print other \ |
ba95710a JT |
318 | >observed.oids && |
319 | grep "$(git -C server rev-parse message1:a.txt)" observed.oids && | |
320 | ||
321 | # Ensure that client passes fsck | |
322 | git -C client fsck | |
323 | ' | |
324 | ||
325 | test_expect_success 'do not advertise filter if not configured to do so' ' | |
326 | SERVER="file://$(pwd)/server" && | |
327 | ||
328 | rm "$(pwd)/trace" && | |
329 | git -C server config uploadpack.allowfilter 1 && | |
330 | GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \ | |
331 | ls-remote "$SERVER" && | |
332 | grep "fetch=.*filter" trace && | |
333 | ||
334 | rm "$(pwd)/trace" && | |
335 | git -C server config uploadpack.allowfilter 0 && | |
336 | GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \ | |
337 | ls-remote "$SERVER" && | |
338 | grep "fetch=" trace >fetch_capabilities && | |
339 | ! grep filter fetch_capabilities | |
340 | ' | |
341 | ||
342 | test_expect_success 'partial clone warns if filter is not advertised' ' | |
343 | rm -rf client && | |
344 | git -C server config uploadpack.allowfilter 0 && | |
345 | git -c protocol.version=2 \ | |
346 | clone --filter=blob:none "file://$(pwd)/server" client 2>err && | |
347 | test_i18ngrep "filtering not recognized by server, ignoring" err | |
348 | ' | |
349 | ||
350 | test_expect_success 'even with handcrafted request, filter does not work if not advertised' ' | |
351 | git -C server config uploadpack.allowfilter 0 && | |
352 | ||
353 | # Custom request that tries to filter even though it is not advertised. | |
8ea40cc5 | 354 | test-tool pkt-line pack >in <<-EOF && |
ba95710a JT |
355 | command=fetch |
356 | 0001 | |
357 | want $(git -C server rev-parse master) | |
358 | filter blob:none | |
359 | 0000 | |
360 | EOF | |
361 | ||
362 | test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err && | |
363 | grep "unexpected line: .filter blob:none." err && | |
364 | ||
365 | # Exercise to ensure that if advertised, filter works | |
366 | git -C server config uploadpack.allowfilter 1 && | |
367 | git -C server serve --stateless-rpc <in >/dev/null | |
368 | ' | |
369 | ||
dcc73cf7 BW |
370 | test_expect_success 'default refspec is used to filter ref when fetchcing' ' |
371 | test_when_finished "rm -f log" && | |
372 | ||
373 | GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \ | |
374 | fetch origin && | |
375 | ||
376 | git -C file_child log -1 --format=%s three >actual && | |
377 | git -C file_parent log -1 --format=%s three >expect && | |
378 | test_cmp expect actual && | |
379 | ||
380 | grep "ref-prefix refs/heads/" log && | |
381 | grep "ref-prefix refs/tags/" log | |
382 | ' | |
383 | ||
15cfc985 JT |
384 | test_expect_success 'fetch supports various ways of have lines' ' |
385 | rm -rf server client trace && | |
386 | git init server && | |
387 | test_commit -C server dwim && | |
388 | TREE=$(git -C server rev-parse HEAD^{tree}) && | |
389 | git -C server tag exact \ | |
390 | $(git -C server commit-tree -m a "$TREE") && | |
391 | git -C server tag dwim-unwanted \ | |
392 | $(git -C server commit-tree -m b "$TREE") && | |
393 | git -C server tag exact-unwanted \ | |
394 | $(git -C server commit-tree -m c "$TREE") && | |
395 | git -C server tag prefix1 \ | |
396 | $(git -C server commit-tree -m d "$TREE") && | |
397 | git -C server tag prefix2 \ | |
398 | $(git -C server commit-tree -m e "$TREE") && | |
399 | git -C server tag fetch-by-sha1 \ | |
400 | $(git -C server commit-tree -m f "$TREE") && | |
401 | git -C server tag completely-unrelated \ | |
402 | $(git -C server commit-tree -m g "$TREE") && | |
403 | ||
404 | git init client && | |
405 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ | |
406 | fetch "file://$(pwd)/server" \ | |
407 | dwim \ | |
408 | refs/tags/exact \ | |
409 | refs/tags/prefix*:refs/tags/prefix* \ | |
410 | "$(git -C server rev-parse fetch-by-sha1)" && | |
411 | ||
412 | # Ensure that the appropriate prefixes are sent (using a sample) | |
413 | grep "fetch> ref-prefix dwim" trace && | |
414 | grep "fetch> ref-prefix refs/heads/dwim" trace && | |
415 | grep "fetch> ref-prefix refs/tags/prefix" trace && | |
416 | ||
417 | # Ensure that the correct objects are returned | |
418 | git -C client cat-file -e $(git -C server rev-parse dwim) && | |
419 | git -C client cat-file -e $(git -C server rev-parse exact) && | |
420 | git -C client cat-file -e $(git -C server rev-parse prefix1) && | |
421 | git -C client cat-file -e $(git -C server rev-parse prefix2) && | |
422 | git -C client cat-file -e $(git -C server rev-parse fetch-by-sha1) && | |
423 | test_must_fail git -C client cat-file -e \ | |
424 | $(git -C server rev-parse dwim-unwanted) && | |
425 | test_must_fail git -C client cat-file -e \ | |
426 | $(git -C server rev-parse exact-unwanted) && | |
427 | test_must_fail git -C client cat-file -e \ | |
428 | $(git -C server rev-parse completely-unrelated) | |
429 | ' | |
430 | ||
2b554353 JT |
431 | test_expect_success 'fetch supports include-tag and tag following' ' |
432 | rm -rf server client trace && | |
433 | git init server && | |
434 | ||
435 | test_commit -C server to_fetch && | |
436 | git -C server tag -a annotated_tag -m message && | |
437 | ||
438 | git init client && | |
439 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ | |
440 | fetch "$(pwd)/server" to_fetch:to_fetch && | |
441 | ||
442 | grep "fetch> ref-prefix to_fetch" trace && | |
443 | grep "fetch> ref-prefix refs/tags/" trace && | |
444 | grep "fetch> include-tag" trace && | |
445 | ||
446 | git -C client cat-file -e $(git -C client rev-parse annotated_tag) | |
447 | ' | |
448 | ||
d1035cac JT |
449 | test_expect_success 'upload-pack respects client shallows' ' |
450 | rm -rf server client trace && | |
451 | ||
452 | git init server && | |
453 | test_commit -C server base && | |
454 | test_commit -C server client_has && | |
455 | ||
456 | git clone --depth=1 "file://$(pwd)/server" client && | |
457 | ||
458 | # Add extra commits to the client so that the whole fetch takes more | |
459 | # than 1 request (due to negotiation) | |
460 | for i in $(test_seq 1 32) | |
461 | do | |
462 | test_commit -C client c$i | |
463 | done && | |
464 | ||
465 | git -C server checkout -b newbranch base && | |
466 | test_commit -C server client_wants && | |
467 | ||
468 | GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \ | |
469 | fetch origin newbranch && | |
470 | # Ensure that protocol v2 is used | |
471 | grep "fetch< version 2" trace | |
472 | ' | |
473 | ||
0f1dc53f BW |
474 | # Test protocol v2 with 'http://' transport |
475 | # | |
476 | . "$TEST_DIRECTORY"/lib-httpd.sh | |
477 | start_httpd | |
478 | ||
479 | test_expect_success 'create repo to be served by http:// transport' ' | |
480 | git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && | |
481 | git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true && | |
482 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one | |
483 | ' | |
484 | ||
485 | test_expect_success 'clone with http:// using protocol v2' ' | |
486 | test_when_finished "rm -f log" && | |
487 | ||
488 | GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \ | |
489 | clone "$HTTPD_URL/smart/http_parent" http_child && | |
490 | ||
491 | git -C http_child log -1 --format=%s >actual && | |
492 | git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect && | |
493 | test_cmp expect actual && | |
494 | ||
495 | # Client requested to use protocol v2 | |
496 | grep "Git-Protocol: version=2" log && | |
497 | # Server responded using protocol v2 | |
498 | grep "git< version 2" log | |
499 | ' | |
500 | ||
501 | test_expect_success 'fetch with http:// using protocol v2' ' | |
502 | test_when_finished "rm -f log" && | |
503 | ||
504 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two && | |
505 | ||
506 | GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \ | |
507 | fetch && | |
508 | ||
509 | git -C http_child log -1 --format=%s origin/master >actual && | |
510 | git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect && | |
511 | test_cmp expect actual && | |
512 | ||
513 | # Server responded using protocol v2 | |
514 | grep "git< version 2" log | |
515 | ' | |
516 | ||
a4d78ce2 BW |
517 | test_expect_success 'push with http:// and a config of v2 does not request v2' ' |
518 | test_when_finished "rm -f log" && | |
519 | # Till v2 for push is designed, make sure that if a client has | |
520 | # protocol.version configured to use v2, that the client instead falls | |
521 | # back and uses v0. | |
522 | ||
523 | test_commit -C http_child three && | |
524 | ||
525 | # Push to another branch, as the target repository has the | |
526 | # master branch checked out and we cannot push into it. | |
527 | GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \ | |
528 | push origin HEAD:client_branch && | |
529 | ||
530 | git -C http_child log -1 --format=%s >actual && | |
531 | git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect && | |
532 | test_cmp expect actual && | |
533 | ||
534 | # Client didnt request to use protocol v2 | |
535 | ! grep "Git-Protocol: version=2" log && | |
536 | # Server didnt respond using protocol v2 | |
537 | ! grep "git< version 2" log | |
538 | ' | |
539 | ||
5400b2a2 JT |
540 | test_expect_success 'when server sends "ready", expect DELIM' ' |
541 | rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child && | |
542 | ||
543 | git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && | |
544 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one && | |
545 | ||
546 | git clone "$HTTPD_URL/smart/http_parent" http_child && | |
547 | ||
548 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two && | |
549 | ||
550 | # After "ready" in the acknowledgments section, pretend that a FLUSH | |
551 | # (0000) was sent instead of a DELIM (0001). | |
552 | printf "/ready/,$ s/0001/0000/" \ | |
553 | >"$HTTPD_ROOT_PATH/one-time-sed" && | |
554 | ||
555 | test_must_fail git -C http_child -c protocol.version=2 \ | |
556 | fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && | |
557 | test_i18ngrep "expected packfile to be sent after .ready." err | |
558 | ' | |
559 | ||
560 | test_expect_success 'when server does not send "ready", expect FLUSH' ' | |
561 | rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child log && | |
562 | ||
563 | git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" && | |
564 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one && | |
565 | ||
566 | git clone "$HTTPD_URL/smart/http_parent" http_child && | |
567 | ||
568 | test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two && | |
569 | ||
570 | # Create many commits to extend the negotiation phase across multiple | |
571 | # requests, so that the server does not send "ready" in the first | |
572 | # request. | |
573 | for i in $(test_seq 1 32) | |
574 | do | |
575 | test_commit -C http_child c$i | |
576 | done && | |
577 | ||
578 | # After the acknowledgments section, pretend that a DELIM | |
579 | # (0001) was sent instead of a FLUSH (0000). | |
580 | printf "/acknowledgments/,$ s/0000/0001/" \ | |
581 | >"$HTTPD_ROOT_PATH/one-time-sed" && | |
582 | ||
583 | test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \ | |
584 | -c protocol.version=2 \ | |
585 | fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err && | |
586 | grep "fetch< acknowledgments" log && | |
587 | ! grep "fetch< ready" log && | |
588 | test_i18ngrep "expected no other sections to be sent after no .ready." err | |
589 | ' | |
a4d78ce2 | 590 | |
0f1dc53f BW |
591 | stop_httpd |
592 | ||
e52449b6 | 593 | test_done |