3 test_description='test git wire-protocol version 2'
9 # Test protocol v2 with 'git://' transport
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
15 test_expect_success 'create repo to be served by git-daemon' '
16 git init "$daemon_parent" &&
17 test_commit -C "$daemon_parent" one
20 test_expect_success 'list refs with git:// using protocol v2' '
21 test_when_finished "rm -f log" &&
23 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
24 ls-remote --symref "$GIT_DAEMON_URL/parent" >actual &&
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 &&
31 git ls-remote --symref "$GIT_DAEMON_URL/parent" >expect &&
32 test_cmp expect actual
35 test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
36 test_when_finished "rm -f log" &&
38 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
39 ls-remote "$GIT_DAEMON_URL/parent" master >actual &&
42 $(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master
45 test_cmp expect actual
48 test_expect_success 'clone with git:// using protocol v2' '
49 test_when_finished "rm -f log" &&
51 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
52 clone "$GIT_DAEMON_URL/parent" daemon_child &&
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 &&
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
64 test_expect_success 'fetch with git:// using protocol v2' '
65 test_when_finished "rm -f log" &&
67 test_commit -C "$daemon_parent" two &&
69 GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
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 &&
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
82 test_expect_success 'fetch by hash without tag following with protocol v2 does not list refs' '
83 test_when_finished "rm -f log" &&
85 test_commit -C "$daemon_parent" two_a &&
86 git -C "$daemon_parent" rev-parse two_a >two_a_hash &&
88 GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
89 fetch --no-tags origin $(cat two_a_hash) &&
91 grep "fetch< version 2" log &&
92 ! grep "fetch> command=ls-refs" log
95 test_expect_success 'pull with git:// using protocol v2' '
96 test_when_finished "rm -f log" &&
98 GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
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 &&
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
111 test_expect_success 'push with git:// and a config of v2 does not request v2' '
112 test_when_finished "rm -f log" &&
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
118 test_commit -C daemon_child three &&
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 &&
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 &&
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
137 # Test protocol v2 with 'file://' transport
139 test_expect_success 'create repo to be served by file:// transport' '
140 git init file_parent &&
141 test_commit -C file_parent one
144 test_expect_success 'list refs with file:// using protocol v2' '
145 test_when_finished "rm -f log" &&
147 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
148 ls-remote --symref "file://$(pwd)/file_parent" >actual &&
150 # Server responded using protocol v2
151 grep "git< version 2" log &&
153 git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
154 test_cmp expect actual
157 test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
158 test_when_finished "rm -f log" &&
160 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
161 ls-remote "file://$(pwd)/file_parent" master >actual &&
163 cat >expect <<-EOF &&
164 $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
167 test_cmp expect actual
170 test_expect_success 'server-options are sent when using ls-remote' '
171 test_when_finished "rm -f log" &&
173 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
174 ls-remote -o hello -o world "file://$(pwd)/file_parent" master >actual &&
176 cat >expect <<-EOF &&
177 $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
180 test_cmp expect actual &&
181 grep "server-option=hello" log &&
182 grep "server-option=world" log
185 test_expect_success 'warn if using server-option with ls-remote with legacy protocol' '
186 test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
187 ls-remote -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
189 test_i18ngrep "see protocol.version in" err &&
190 test_i18ngrep "server options require protocol version 2 or later" err
193 test_expect_success 'clone with file:// using protocol v2' '
194 test_when_finished "rm -f log" &&
196 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
197 clone "file://$(pwd)/file_parent" file_child &&
199 git -C file_child log -1 --format=%s >actual &&
200 git -C file_parent log -1 --format=%s >expect &&
201 test_cmp expect actual &&
203 # Server responded using protocol v2
204 grep "clone< version 2" log &&
206 # Client sent ref-prefixes to filter the ref-advertisement
207 grep "ref-prefix HEAD" log &&
208 grep "ref-prefix refs/heads/" log &&
209 grep "ref-prefix refs/tags/" log
212 test_expect_success 'fetch with file:// using protocol v2' '
213 test_when_finished "rm -f log" &&
215 test_commit -C file_parent two &&
217 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
220 git -C file_child log -1 --format=%s origin/master >actual &&
221 git -C file_parent log -1 --format=%s >expect &&
222 test_cmp expect actual &&
224 # Server responded using protocol v2
225 grep "fetch< version 2" log
228 test_expect_success 'ref advertisement is filtered during fetch using protocol v2' '
229 test_when_finished "rm -f log" &&
231 test_commit -C file_parent three &&
232 git -C file_parent branch unwanted-branch three &&
234 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
235 fetch origin master &&
237 git -C file_child log -1 --format=%s origin/master >actual &&
238 git -C file_parent log -1 --format=%s >expect &&
239 test_cmp expect actual &&
241 grep "refs/heads/master" log &&
242 ! grep "refs/heads/unwanted-branch" log
245 test_expect_success 'server-options are sent when fetching' '
246 test_when_finished "rm -f log" &&
248 test_commit -C file_parent four &&
250 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
251 fetch -o hello -o world origin master &&
253 git -C file_child log -1 --format=%s origin/master >actual &&
254 git -C file_parent log -1 --format=%s >expect &&
255 test_cmp expect actual &&
257 grep "server-option=hello" log &&
258 grep "server-option=world" log
261 test_expect_success 'warn if using server-option with fetch with legacy protocol' '
262 test_when_finished "rm -rf temp_child" &&
264 git init temp_child &&
266 test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
267 fetch -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
269 test_i18ngrep "see protocol.version in" err &&
270 test_i18ngrep "server options require protocol version 2 or later" err
273 test_expect_success 'server-options are sent when cloning' '
274 test_when_finished "rm -rf log myclone" &&
276 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
277 clone --server-option=hello --server-option=world \
278 "file://$(pwd)/file_parent" myclone &&
280 grep "server-option=hello" log &&
281 grep "server-option=world" log
284 test_expect_success 'warn if using server-option with clone with legacy protocol' '
285 test_when_finished "rm -rf myclone" &&
287 test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
288 clone --server-option=hello --server-option=world \
289 "file://$(pwd)/file_parent" myclone 2>err &&
291 test_i18ngrep "see protocol.version in" err &&
292 test_i18ngrep "server options require protocol version 2 or later" err
295 test_expect_success 'upload-pack respects config using protocol v2' '
297 write_script server/.git/hook <<-\EOF &&
301 test_commit -C server one &&
303 test_config_global uploadpack.packobjectshook ./hook &&
304 test_path_is_missing server/.git/hookout &&
305 git -c protocol.version=2 clone "file://$(pwd)/server" client &&
306 test_path_is_file server/.git/hookout
309 test_expect_success 'setup filter tests' '
310 rm -rf server client &&
313 # 1 commit to create a file, and 1 commit to modify it
314 test_commit -C server message1 a.txt &&
315 test_commit -C server message2 a.txt &&
316 git -C server config protocol.version 2 &&
317 git -C server config uploadpack.allowfilter 1 &&
318 git -C server config uploadpack.allowanysha1inwant 1 &&
319 git -C server config protocol.version 2
322 test_expect_success 'partial clone' '
323 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
324 clone --filter=blob:none "file://$(pwd)/server" client &&
325 grep "version 2" trace &&
327 # Ensure that the old version of the file is missing
328 git -C client rev-list --quiet --objects --missing=print master \
330 grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
332 # Ensure that client passes fsck
336 test_expect_success 'dynamically fetch missing object' '
338 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
339 cat-file -p $(git -C server rev-parse message1:a.txt) &&
340 grep "version 2" trace
343 test_expect_success 'when dynamically fetching missing object, do not list refs' '
344 ! grep "git> command=ls-refs" trace
347 test_expect_success 'partial fetch' '
348 rm -rf client "$(pwd)/trace" &&
350 SERVER="file://$(pwd)/server" &&
351 test_config -C client extensions.partialClone "$SERVER" &&
353 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
354 fetch --filter=blob:none "$SERVER" master:refs/heads/other &&
355 grep "version 2" trace &&
357 # Ensure that the old version of the file is missing
358 git -C client rev-list --quiet --objects --missing=print other \
360 grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
362 # Ensure that client passes fsck
366 test_expect_success 'do not advertise filter if not configured to do so' '
367 SERVER="file://$(pwd)/server" &&
370 git -C server config uploadpack.allowfilter 1 &&
371 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
372 ls-remote "$SERVER" &&
373 grep "fetch=.*filter" trace &&
376 git -C server config uploadpack.allowfilter 0 &&
377 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
378 ls-remote "$SERVER" &&
379 grep "fetch=" trace >fetch_capabilities &&
380 ! grep filter fetch_capabilities
383 test_expect_success 'partial clone warns if filter is not advertised' '
385 git -C server config uploadpack.allowfilter 0 &&
386 git -c protocol.version=2 \
387 clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
388 test_i18ngrep "filtering not recognized by server, ignoring" err
391 test_expect_success 'even with handcrafted request, filter does not work if not advertised' '
392 git -C server config uploadpack.allowfilter 0 &&
394 # Custom request that tries to filter even though it is not advertised.
395 test-tool pkt-line pack >in <<-EOF &&
398 want $(git -C server rev-parse master)
403 test_must_fail test-tool -C server serve-v2 --stateless-rpc \
404 <in >/dev/null 2>err &&
405 grep "unexpected line: .filter blob:none." err &&
407 # Exercise to ensure that if advertised, filter works
408 git -C server config uploadpack.allowfilter 1 &&
409 test-tool -C server serve-v2 --stateless-rpc <in >/dev/null
412 test_expect_success 'default refspec is used to filter ref when fetchcing' '
413 test_when_finished "rm -f log" &&
415 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
418 git -C file_child log -1 --format=%s three >actual &&
419 git -C file_parent log -1 --format=%s three >expect &&
420 test_cmp expect actual &&
422 grep "ref-prefix refs/heads/" log &&
423 grep "ref-prefix refs/tags/" log
426 test_expect_success 'fetch supports various ways of have lines' '
427 rm -rf server client trace &&
429 test_commit -C server dwim &&
430 TREE=$(git -C server rev-parse HEAD^{tree}) &&
431 git -C server tag exact \
432 $(git -C server commit-tree -m a "$TREE") &&
433 git -C server tag dwim-unwanted \
434 $(git -C server commit-tree -m b "$TREE") &&
435 git -C server tag exact-unwanted \
436 $(git -C server commit-tree -m c "$TREE") &&
437 git -C server tag prefix1 \
438 $(git -C server commit-tree -m d "$TREE") &&
439 git -C server tag prefix2 \
440 $(git -C server commit-tree -m e "$TREE") &&
441 git -C server tag fetch-by-sha1 \
442 $(git -C server commit-tree -m f "$TREE") &&
443 git -C server tag completely-unrelated \
444 $(git -C server commit-tree -m g "$TREE") &&
447 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
448 fetch "file://$(pwd)/server" \
451 refs/tags/prefix*:refs/tags/prefix* \
452 "$(git -C server rev-parse fetch-by-sha1)" &&
454 # Ensure that the appropriate prefixes are sent (using a sample)
455 grep "fetch> ref-prefix dwim" trace &&
456 grep "fetch> ref-prefix refs/heads/dwim" trace &&
457 grep "fetch> ref-prefix refs/tags/prefix" trace &&
459 # Ensure that the correct objects are returned
460 git -C client cat-file -e $(git -C server rev-parse dwim) &&
461 git -C client cat-file -e $(git -C server rev-parse exact) &&
462 git -C client cat-file -e $(git -C server rev-parse prefix1) &&
463 git -C client cat-file -e $(git -C server rev-parse prefix2) &&
464 git -C client cat-file -e $(git -C server rev-parse fetch-by-sha1) &&
465 test_must_fail git -C client cat-file -e \
466 $(git -C server rev-parse dwim-unwanted) &&
467 test_must_fail git -C client cat-file -e \
468 $(git -C server rev-parse exact-unwanted) &&
469 test_must_fail git -C client cat-file -e \
470 $(git -C server rev-parse completely-unrelated)
473 test_expect_success 'fetch supports include-tag and tag following' '
474 rm -rf server client trace &&
477 test_commit -C server to_fetch &&
478 git -C server tag -a annotated_tag -m message &&
481 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
482 fetch "$(pwd)/server" to_fetch:to_fetch &&
484 grep "fetch> ref-prefix to_fetch" trace &&
485 grep "fetch> ref-prefix refs/tags/" trace &&
486 grep "fetch> include-tag" trace &&
488 git -C client cat-file -e $(git -C client rev-parse annotated_tag)
491 test_expect_success 'upload-pack respects client shallows' '
492 rm -rf server client trace &&
495 test_commit -C server base &&
496 test_commit -C server client_has &&
498 git clone --depth=1 "file://$(pwd)/server" client &&
500 # Add extra commits to the client so that the whole fetch takes more
501 # than 1 request (due to negotiation)
502 test_commit_bulk -C client --id=c 32 &&
504 git -C server checkout -b newbranch base &&
505 test_commit -C server client_wants &&
507 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
508 fetch origin newbranch &&
509 # Ensure that protocol v2 is used
510 grep "fetch< version 2" trace
513 test_expect_success 'ensure that multiple fetches in same process from a shallow repo works' '
514 rm -rf server client trace &&
516 test_create_repo server &&
517 test_commit -C server one &&
518 test_commit -C server two &&
519 test_commit -C server three &&
520 git clone --shallow-exclude two "file://$(pwd)/server" client &&
522 git -C server tag -a -m "an annotated tag" twotag two &&
524 # Triggers tag following (thus, 2 fetches in one process)
525 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
526 fetch --shallow-exclude one origin &&
527 # Ensure that protocol v2 is used
528 grep "fetch< version 2" trace
531 test_expect_success 'deepen-relative' '
532 rm -rf server client trace &&
534 test_create_repo server &&
535 test_commit -C server one &&
536 test_commit -C server two &&
537 test_commit -C server three &&
538 git clone --depth 1 "file://$(pwd)/server" client &&
539 test_commit -C server four &&
541 # Sanity check that only "three" is downloaded
542 git -C client log --pretty=tformat:%s master >actual &&
543 echo three >expected &&
544 test_cmp expected actual &&
546 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
547 fetch --deepen=1 origin &&
548 # Ensure that protocol v2 is used
549 grep "fetch< version 2" trace &&
551 git -C client log --pretty=tformat:%s origin/master >actual &&
552 cat >expected <<-\EOF &&
557 test_cmp expected actual
560 # Test protocol v2 with 'http://' transport
562 . "$TEST_DIRECTORY"/lib-httpd.sh
565 test_expect_success 'create repo to be served by http:// transport' '
566 git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
567 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true &&
568 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one
571 test_expect_success 'clone with http:// using protocol v2' '
572 test_when_finished "rm -f log" &&
574 GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
575 clone "$HTTPD_URL/smart/http_parent" http_child &&
577 git -C http_child log -1 --format=%s >actual &&
578 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
579 test_cmp expect actual &&
581 # Client requested to use protocol v2
582 grep "Git-Protocol: version=2" log &&
583 # Server responded using protocol v2
584 grep "git< version 2" log &&
585 # Verify that the chunked encoding sending codepath is NOT exercised
586 ! grep "Send header: Transfer-Encoding: chunked" log
589 test_expect_success 'clone big repository with http:// using protocol v2' '
590 test_when_finished "rm -f log" &&
592 git init "$HTTPD_DOCUMENT_ROOT_PATH/big" &&
593 # Ensure that the list of wants is greater than http.postbuffer below
594 for i in $(test_seq 1 1500)
596 # do not use here-doc, because it requires a process
598 echo "commit refs/heads/too-many-refs-$i" &&
599 echo "committer git <git@example.com> $i +0000" &&
601 echo "M 644 inline bla.txt" &&
604 done | git -C "$HTTPD_DOCUMENT_ROOT_PATH/big" fast-import &&
606 GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git \
607 -c protocol.version=2 -c http.postbuffer=65536 \
608 clone "$HTTPD_URL/smart/big" big_child &&
610 # Client requested to use protocol v2
611 grep "Git-Protocol: version=2" log &&
612 # Server responded using protocol v2
613 grep "git< version 2" log &&
614 # Verify that the chunked encoding sending codepath is exercised
615 grep "Send header: Transfer-Encoding: chunked" log
618 test_expect_success 'fetch with http:// using protocol v2' '
619 test_when_finished "rm -f log" &&
621 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
623 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
626 git -C http_child log -1 --format=%s origin/master >actual &&
627 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
628 test_cmp expect actual &&
630 # Server responded using protocol v2
631 grep "git< version 2" log
634 test_expect_success 'fetch with http:// by hash without tag following with protocol v2 does not list refs' '
635 test_when_finished "rm -f log" &&
637 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two_a &&
638 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" rev-parse two_a >two_a_hash &&
640 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
641 fetch --no-tags origin $(cat two_a_hash) &&
643 grep "fetch< version 2" log &&
644 ! grep "fetch> command=ls-refs" log
647 test_expect_success 'fetch from namespaced repo respects namespaces' '
648 test_when_finished "rm -f log" &&
650 git init "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" &&
651 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" one &&
652 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" two &&
653 git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" \
654 update-ref refs/namespaces/ns/refs/heads/master one &&
656 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
657 fetch "$HTTPD_URL/smart_namespace/nsrepo" \
658 refs/heads/master:refs/heads/theirs &&
660 # Server responded using protocol v2
661 grep "fetch< version 2" log &&
663 git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" rev-parse one >expect &&
664 git -C http_child rev-parse theirs >actual &&
665 test_cmp expect actual
668 test_expect_success 'push with http:// and a config of v2 does not request v2' '
669 test_when_finished "rm -f log" &&
670 # Till v2 for push is designed, make sure that if a client has
671 # protocol.version configured to use v2, that the client instead falls
674 test_commit -C http_child three &&
676 # Push to another branch, as the target repository has the
677 # master branch checked out and we cannot push into it.
678 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
679 push origin HEAD:client_branch &&
681 git -C http_child log -1 --format=%s >actual &&
682 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
683 test_cmp expect actual &&
685 # Client did not request to use protocol v2
686 ! grep "Git-Protocol: version=2" log &&
687 # Server did not respond using protocol v2
688 ! grep "git< version 2" log
691 test_expect_success 'when server sends "ready", expect DELIM' '
692 rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child &&
694 git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
695 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
697 git clone "$HTTPD_URL/smart/http_parent" http_child &&
699 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
701 # After "ready" in the acknowledgments section, pretend that a FLUSH
702 # (0000) was sent instead of a DELIM (0001).
703 printf "/ready/,$ s/0001/0000/" \
704 >"$HTTPD_ROOT_PATH/one-time-sed" &&
706 test_must_fail git -C http_child -c protocol.version=2 \
707 fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
708 test_i18ngrep "expected packfile to be sent after .ready." err
711 test_expect_success 'when server does not send "ready", expect FLUSH' '
712 rm -rf "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" http_child log &&
714 git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
715 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one &&
717 git clone "$HTTPD_URL/smart/http_parent" http_child &&
719 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
721 # Create many commits to extend the negotiation phase across multiple
722 # requests, so that the server does not send "ready" in the first
724 test_commit_bulk -C http_child --id=c 32 &&
726 # After the acknowledgments section, pretend that a DELIM
727 # (0001) was sent instead of a FLUSH (0000).
728 printf "/acknowledgments/,$ s/0000/0001/" \
729 >"$HTTPD_ROOT_PATH/one-time-sed" &&
731 test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \
732 -c protocol.version=2 \
733 fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
734 grep "fetch< .*acknowledgments" log &&
735 ! grep "fetch< .*ready" log &&
736 test_i18ngrep "expected no other sections to be sent after no .ready." err
739 # DO NOT add non-httpd-specific tests here, because the last part of this
740 # test script is only executed when httpd is available and enabled.