rerere: add documentation for conflict normalization
[git.git] / t / t5702-protocol-v2.sh
bloba4fe6508bdd73784758b2ea80ab81752e15c01b3
1 #!/bin/sh
3 test_description='test git wire-protocol version 2'
5 TEST_NO_CREATE_REPO=1
7 . ./test-lib.sh
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 actual expect
35 test_expect_success 'ref advertisment 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 &&
41 cat >expect <<-EOF &&
42 $(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master
43 EOF
45 test_cmp actual expect
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 \
70 fetch &&
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 'pull with git:// using protocol v2' '
83 test_when_finished "rm -f log" &&
85 GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
86 pull &&
88 git -C daemon_child log -1 --format=%s >actual &&
89 git -C "$daemon_parent" log -1 --format=%s >expect &&
90 test_cmp expect actual &&
92 # Client requested to use protocol v2
93 grep "fetch> .*\\\0\\\0version=2\\\0$" log &&
94 # Server responded using protocol v2
95 grep "fetch< version 2" log
98 test_expect_success 'push with git:// and a config of v2 does not request v2' '
99 test_when_finished "rm -f log" &&
101 # Till v2 for push is designed, make sure that if a client has
102 # protocol.version configured to use v2, that the client instead falls
103 # back and uses v0.
105 test_commit -C daemon_child three &&
107 # Push to another branch, as the target repository has the
108 # master branch checked out and we cannot push into it.
109 GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
110 push origin HEAD:client_branch &&
112 git -C daemon_child log -1 --format=%s >actual &&
113 git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
114 test_cmp expect actual &&
116 # Client requested to use protocol v2
117 ! grep "push> .*\\\0\\\0version=2\\\0$" log &&
118 # Server responded using protocol v2
119 ! grep "push< version 2" log
122 stop_git_daemon
124 # Test protocol v2 with 'file://' transport
126 test_expect_success 'create repo to be served by file:// transport' '
127 git init file_parent &&
128 test_commit -C file_parent one
131 test_expect_success 'list refs with file:// using protocol v2' '
132 test_when_finished "rm -f log" &&
134 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
135 ls-remote --symref "file://$(pwd)/file_parent" >actual &&
137 # Server responded using protocol v2
138 grep "git< version 2" log &&
140 git ls-remote --symref "file://$(pwd)/file_parent" >expect &&
141 test_cmp actual expect
144 test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
145 test_when_finished "rm -f log" &&
147 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
148 ls-remote "file://$(pwd)/file_parent" master >actual &&
150 cat >expect <<-EOF &&
151 $(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
154 test_cmp actual expect
157 test_expect_success 'server-options are sent when using ls-remote' '
158 test_when_finished "rm -f log" &&
160 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
161 ls-remote -o hello -o world "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 actual expect &&
168 grep "server-option=hello" log &&
169 grep "server-option=world" log
173 test_expect_success 'clone with file:// using protocol v2' '
174 test_when_finished "rm -f log" &&
176 GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
177 clone "file://$(pwd)/file_parent" file_child &&
179 git -C file_child log -1 --format=%s >actual &&
180 git -C file_parent log -1 --format=%s >expect &&
181 test_cmp expect actual &&
183 # Server responded using protocol v2
184 grep "clone< version 2" log
187 test_expect_success 'fetch with file:// using protocol v2' '
188 test_when_finished "rm -f log" &&
190 test_commit -C file_parent two &&
192 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
193 fetch origin &&
195 git -C file_child log -1 --format=%s origin/master >actual &&
196 git -C file_parent log -1 --format=%s >expect &&
197 test_cmp expect actual &&
199 # Server responded using protocol v2
200 grep "fetch< version 2" log
203 test_expect_success 'ref advertisment is filtered during fetch using protocol v2' '
204 test_when_finished "rm -f log" &&
206 test_commit -C file_parent three &&
208 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
209 fetch origin master &&
211 git -C file_child log -1 --format=%s origin/master >actual &&
212 git -C file_parent log -1 --format=%s >expect &&
213 test_cmp expect actual &&
215 ! grep "refs/tags/one" log &&
216 ! grep "refs/tags/two" log &&
217 ! grep "refs/tags/three" log
220 test_expect_success 'server-options are sent when fetching' '
221 test_when_finished "rm -f log" &&
223 test_commit -C file_parent four &&
225 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
226 fetch -o hello -o world origin master &&
228 git -C file_child log -1 --format=%s origin/master >actual &&
229 git -C file_parent log -1 --format=%s >expect &&
230 test_cmp expect actual &&
232 grep "server-option=hello" log &&
233 grep "server-option=world" log
236 test_expect_success 'upload-pack respects config using protocol v2' '
237 git init server &&
238 write_script server/.git/hook <<-\EOF &&
239 touch hookout
240 "$@"
242 test_commit -C server one &&
244 test_config_global uploadpack.packobjectshook ./hook &&
245 test_path_is_missing server/.git/hookout &&
246 git -c protocol.version=2 clone "file://$(pwd)/server" client &&
247 test_path_is_file server/.git/hookout
250 test_expect_success 'setup filter tests' '
251 rm -rf server client &&
252 git init server &&
254 # 1 commit to create a file, and 1 commit to modify it
255 test_commit -C server message1 a.txt &&
256 test_commit -C server message2 a.txt &&
257 git -C server config protocol.version 2 &&
258 git -C server config uploadpack.allowfilter 1 &&
259 git -C server config uploadpack.allowanysha1inwant 1 &&
260 git -C server config protocol.version 2
263 test_expect_success 'partial clone' '
264 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
265 clone --filter=blob:none "file://$(pwd)/server" client &&
266 grep "version 2" trace &&
268 # Ensure that the old version of the file is missing
269 git -C client rev-list master --quiet --objects --missing=print \
270 >observed.oids &&
271 grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
273 # Ensure that client passes fsck
274 git -C client fsck
277 test_expect_success 'dynamically fetch missing object' '
278 rm "$(pwd)/trace" &&
279 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
280 cat-file -p $(git -C server rev-parse message1:a.txt) &&
281 grep "version 2" trace
284 test_expect_success 'partial fetch' '
285 rm -rf client "$(pwd)/trace" &&
286 git init client &&
287 SERVER="file://$(pwd)/server" &&
288 test_config -C client extensions.partialClone "$SERVER" &&
290 GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
291 fetch --filter=blob:none "$SERVER" master:refs/heads/other &&
292 grep "version 2" trace &&
294 # Ensure that the old version of the file is missing
295 git -C client rev-list other --quiet --objects --missing=print \
296 >observed.oids &&
297 grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
299 # Ensure that client passes fsck
300 git -C client fsck
303 test_expect_success 'do not advertise filter if not configured to do so' '
304 SERVER="file://$(pwd)/server" &&
306 rm "$(pwd)/trace" &&
307 git -C server config uploadpack.allowfilter 1 &&
308 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
309 ls-remote "$SERVER" &&
310 grep "fetch=.*filter" trace &&
312 rm "$(pwd)/trace" &&
313 git -C server config uploadpack.allowfilter 0 &&
314 GIT_TRACE_PACKET="$(pwd)/trace" git -c protocol.version=2 \
315 ls-remote "$SERVER" &&
316 grep "fetch=" trace >fetch_capabilities &&
317 ! grep filter fetch_capabilities
320 test_expect_success 'partial clone warns if filter is not advertised' '
321 rm -rf client &&
322 git -C server config uploadpack.allowfilter 0 &&
323 git -c protocol.version=2 \
324 clone --filter=blob:none "file://$(pwd)/server" client 2>err &&
325 test_i18ngrep "filtering not recognized by server, ignoring" err
328 test_expect_success 'even with handcrafted request, filter does not work if not advertised' '
329 git -C server config uploadpack.allowfilter 0 &&
331 # Custom request that tries to filter even though it is not advertised.
332 test-pkt-line pack >in <<-EOF &&
333 command=fetch
334 0001
335 want $(git -C server rev-parse master)
336 filter blob:none
337 0000
340 test_must_fail git -C server serve --stateless-rpc <in >/dev/null 2>err &&
341 grep "unexpected line: .filter blob:none." err &&
343 # Exercise to ensure that if advertised, filter works
344 git -C server config uploadpack.allowfilter 1 &&
345 git -C server serve --stateless-rpc <in >/dev/null
348 test_expect_success 'default refspec is used to filter ref when fetchcing' '
349 test_when_finished "rm -f log" &&
351 GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
352 fetch origin &&
354 git -C file_child log -1 --format=%s three >actual &&
355 git -C file_parent log -1 --format=%s three >expect &&
356 test_cmp expect actual &&
358 grep "ref-prefix refs/heads/" log &&
359 grep "ref-prefix refs/tags/" log
362 # Test protocol v2 with 'http://' transport
364 . "$TEST_DIRECTORY"/lib-httpd.sh
365 start_httpd
367 test_expect_success 'create repo to be served by http:// transport' '
368 git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
369 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true &&
370 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one
373 test_expect_success 'clone with http:// using protocol v2' '
374 test_when_finished "rm -f log" &&
376 GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
377 clone "$HTTPD_URL/smart/http_parent" http_child &&
379 git -C http_child log -1 --format=%s >actual &&
380 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
381 test_cmp expect actual &&
383 # Client requested to use protocol v2
384 grep "Git-Protocol: version=2" log &&
385 # Server responded using protocol v2
386 grep "git< version 2" log
389 test_expect_success 'fetch with http:// using protocol v2' '
390 test_when_finished "rm -f log" &&
392 test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
394 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
395 fetch &&
397 git -C http_child log -1 --format=%s origin/master >actual &&
398 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
399 test_cmp expect actual &&
401 # Server responded using protocol v2
402 grep "git< version 2" log
405 test_expect_success 'push with http:// and a config of v2 does not request v2' '
406 test_when_finished "rm -f log" &&
407 # Till v2 for push is designed, make sure that if a client has
408 # protocol.version configured to use v2, that the client instead falls
409 # back and uses v0.
411 test_commit -C http_child three &&
413 # Push to another branch, as the target repository has the
414 # master branch checked out and we cannot push into it.
415 GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
416 push origin HEAD:client_branch &&
418 git -C http_child log -1 --format=%s >actual &&
419 git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
420 test_cmp expect actual &&
422 # Client didnt request to use protocol v2
423 ! grep "Git-Protocol: version=2" log &&
424 # Server didnt respond using protocol v2
425 ! grep "git< version 2" log
429 stop_httpd
431 test_done