]> git.ipfire.org Git - thirdparty/git.git/blame - t/t5510-fetch.sh
Merge branch 'en/fetch-negotiation-default-fix'
[thirdparty/git.git] / t / t5510-fetch.sh
CommitLineData
7be1d62c
JH
1#!/bin/sh
2# Copyright (c) 2006, Junio C Hamano.
3
4test_description='Per branch config variables affects "git fetch".
5
6'
7
8. ./test-lib.sh
e8a8e7ff 9. "$TEST_DIRECTORY"/lib-bundle.sh
7be1d62c 10
a9d32be4 11D=$(pwd)
7be1d62c
JH
12
13test_expect_success setup '
14 echo >file original &&
15 git add file &&
83ecf26e
JS
16 git commit -a -m original &&
17 git branch -M main
18'
7be1d62c
JH
19
20test_expect_success "clone and setup child repos" '
21 git clone . one &&
18a82692
JN
22 (
23 cd one &&
24 echo >file updated by one &&
25 git commit -a -m "updated by one"
fd4ec4f2 26 ) &&
7be1d62c 27 git clone . two &&
18a82692
JN
28 (
29 cd two &&
83ecf26e 30 git config branch.main.remote one &&
18a82692 31 git config remote.one.url ../one/.git/ &&
83ecf26e 32 git config remote.one.fetch refs/heads/main:refs/heads/one
fd4ec4f2 33 ) &&
6cc7c36d 34 git clone . three &&
18a82692
JN
35 (
36 cd three &&
83ecf26e
JS
37 git config branch.main.remote two &&
38 git config branch.main.merge refs/heads/one &&
18a82692 39 mkdir -p .git/remotes &&
020b813f
ES
40 cat >.git/remotes/two <<-\EOF
41 URL: ../two/.git/
42 Pull: refs/heads/main:refs/heads/two
43 Pull: refs/heads/one:refs/heads/one
44 EOF
fd4ec4f2 45 ) &&
9a7bbd1d
JK
46 git clone . bundle &&
47 git clone . seven
7be1d62c
JH
48'
49
50test_expect_success "fetch test" '
51 cd "$D" &&
52 echo >file updated by origin &&
53 git commit -a -m "updated by origin" &&
54 cd two &&
55 git fetch &&
cbc5cf7c 56 git rev-parse --verify refs/heads/one &&
a9d32be4 57 mine=$(git rev-parse refs/heads/one) &&
83ecf26e 58 his=$(cd ../one && git rev-parse refs/heads/main) &&
7be1d62c
JH
59 test "z$mine" = "z$his"
60'
61
6cc7c36d
SB
62test_expect_success "fetch test for-merge" '
63 cd "$D" &&
64 cd three &&
65 git fetch &&
cbc5cf7c
DT
66 git rev-parse --verify refs/heads/two &&
67 git rev-parse --verify refs/heads/one &&
83ecf26e 68 main_in_two=$(cd ../two && git rev-parse main) &&
a9d32be4 69 one_in_two=$(cd ../two && git rev-parse one) &&
6cc7c36d 70 {
7abcbcb7 71 echo "$one_in_two " &&
83ecf26e 72 echo "$main_in_two not-for-merge"
6cc7c36d
SB
73 } >expected &&
74 cut -f -2 .git/FETCH_HEAD >actual &&
4fdf71be 75 test_cmp expected actual'
6cc7c36d 76
43a8a04a
CMN
77test_expect_success 'fetch --prune on its own works as expected' '
78 cd "$D" &&
79 git clone . prune &&
80 cd prune &&
83ecf26e 81 git update-ref refs/remotes/origin/extrabranch main &&
43a8a04a
CMN
82
83 git fetch --prune origin &&
84 test_must_fail git rev-parse origin/extrabranch
85'
86
ed43de6e 87test_expect_success 'fetch --prune with a branch name keeps branches' '
43a8a04a
CMN
88 cd "$D" &&
89 git clone . prune-branch &&
90 cd prune-branch &&
83ecf26e 91 git update-ref refs/remotes/origin/extrabranch main &&
43a8a04a 92
83ecf26e 93 git fetch --prune origin main &&
43a8a04a
CMN
94 git rev-parse origin/extrabranch
95'
96
ed43de6e 97test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
43a8a04a
CMN
98 cd "$D" &&
99 git clone . prune-namespace &&
100 cd prune-namespace &&
101
102 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
83ecf26e 103 git rev-parse origin/main
43a8a04a
CMN
104'
105
e6f63712 106test_expect_success 'fetch --prune handles overlapping refspecs' '
f377e7a3 107 cd "$D" &&
83ecf26e 108 git update-ref refs/pull/42/head main &&
f377e7a3
CMN
109 git clone . prune-overlapping &&
110 cd prune-overlapping &&
111 git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
112
113 git fetch --prune origin &&
83ecf26e 114 git rev-parse origin/main &&
f377e7a3
CMN
115 git rev-parse origin/pr/42 &&
116
8fb26872 117 git config --unset-all remote.origin.fetch &&
f377e7a3
CMN
118 git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
119 git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
120
121 git fetch --prune origin &&
83ecf26e 122 git rev-parse origin/main &&
f377e7a3
CMN
123 git rev-parse origin/pr/42
124'
125
0838bf47 126test_expect_success 'fetch --prune --tags prunes branches but not tags' '
43a8a04a
CMN
127 cd "$D" &&
128 git clone . prune-tags &&
129 cd prune-tags &&
83ecf26e 130 git tag sometag main &&
68a304d5
MH
131 # Create what looks like a remote-tracking branch from an earlier
132 # fetch that has since been deleted from the remote:
83ecf26e 133 git update-ref refs/remotes/origin/fake-remote main &&
43a8a04a
CMN
134
135 git fetch --prune --tags origin &&
83ecf26e 136 git rev-parse origin/main &&
c5a84e92 137 test_must_fail git rev-parse origin/fake-remote &&
0838bf47 138 git rev-parse sometag
43a8a04a
CMN
139'
140
0838bf47 141test_expect_success 'fetch --prune --tags with branch does not prune other things' '
43a8a04a
CMN
142 cd "$D" &&
143 git clone . prune-tags-branch &&
144 cd prune-tags-branch &&
83ecf26e
JS
145 git tag sometag main &&
146 git update-ref refs/remotes/origin/extrabranch main &&
43a8a04a 147
83ecf26e 148 git fetch --prune --tags origin main &&
c5a84e92 149 git rev-parse origin/extrabranch &&
0838bf47 150 git rev-parse sometag
c5a84e92
MH
151'
152
153test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
154 cd "$D" &&
155 git clone . prune-tags-refspec &&
156 cd prune-tags-refspec &&
83ecf26e
JS
157 git tag sometag main &&
158 git update-ref refs/remotes/origin/foo/otherbranch main &&
159 git update-ref refs/remotes/origin/extrabranch main &&
c5a84e92
MH
160
161 git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
162 test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
163 git rev-parse origin/extrabranch &&
0838bf47 164 git rev-parse sometag
43a8a04a
CMN
165'
166
c9e04d90
TG
167test_expect_success REFFILES 'fetch --prune fails to delete branches' '
168 cd "$D" &&
169 git clone . prune-fail &&
170 cd prune-fail &&
171 git update-ref refs/remotes/origin/extrabranch main &&
172 : this will prevent --prune from locking packed-refs for deleting refs, but adding loose refs still succeeds &&
173 >.git/packed-refs.new &&
174
175 test_must_fail git fetch --prune origin
176'
177
c7b190da
PS
178test_expect_success 'fetch --atomic works with a single branch' '
179 test_when_finished "rm -rf \"$D\"/atomic" &&
180
181 cd "$D" &&
182 git clone . atomic &&
183 git branch atomic-branch &&
184 oid=$(git rev-parse atomic-branch) &&
185 echo "$oid" >expected &&
186
187 git -C atomic fetch --atomic origin &&
188 git -C atomic rev-parse origin/atomic-branch >actual &&
189 test_cmp expected actual &&
190 test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
191'
192
193test_expect_success 'fetch --atomic works with multiple branches' '
194 test_when_finished "rm -rf \"$D\"/atomic" &&
195
196 cd "$D" &&
197 git clone . atomic &&
198 git branch atomic-branch-1 &&
199 git branch atomic-branch-2 &&
200 git branch atomic-branch-3 &&
201 git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
202
203 git -C atomic fetch --atomic origin &&
204 git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
205 test_cmp expected actual
206'
207
208test_expect_success 'fetch --atomic works with mixed branches and tags' '
209 test_when_finished "rm -rf \"$D\"/atomic" &&
210
211 cd "$D" &&
212 git clone . atomic &&
213 git branch atomic-mixed-branch &&
214 git tag atomic-mixed-tag &&
215 git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
216
217 git -C atomic fetch --tags --atomic origin &&
218 git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
219 test_cmp expected actual
220'
221
222test_expect_success 'fetch --atomic prunes references' '
223 test_when_finished "rm -rf \"$D\"/atomic" &&
224
225 cd "$D" &&
226 git branch atomic-prune-delete &&
227 git clone . atomic &&
228 git branch --delete atomic-prune-delete &&
229 git branch atomic-prune-create &&
230 git rev-parse refs/heads/atomic-prune-create >actual &&
231
232 git -C atomic fetch --prune --atomic origin &&
233 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
234 git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
235 test_cmp expected actual
236'
237
238test_expect_success 'fetch --atomic aborts with non-fast-forward update' '
239 test_when_finished "rm -rf \"$D\"/atomic" &&
240
241 cd "$D" &&
242 git branch atomic-non-ff &&
243 git clone . atomic &&
244 git rev-parse HEAD >actual &&
245
246 git branch atomic-new-branch &&
247 parent_commit=$(git rev-parse atomic-non-ff~) &&
248 git update-ref refs/heads/atomic-non-ff $parent_commit &&
249
250 test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
251 test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
252 git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
253 test_cmp expected actual &&
254 test_must_be_empty atomic/.git/FETCH_HEAD
255'
256
257test_expect_success 'fetch --atomic executes a single reference transaction only' '
258 test_when_finished "rm -rf \"$D\"/atomic" &&
259
260 cd "$D" &&
261 git clone . atomic &&
262 git branch atomic-hooks-1 &&
263 git branch atomic-hooks-2 &&
264 head_oid=$(git rev-parse HEAD) &&
265
266 cat >expected <<-EOF &&
267 prepared
268 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
269 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
270 committed
271 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
272 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
273 EOF
274
275 rm -f atomic/actual &&
276 write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
277 ( echo "$*" && cat ) >>actual
278 EOF
279
280 git -C atomic fetch --atomic origin &&
281 test_cmp expected atomic/actual
282'
283
284test_expect_success 'fetch --atomic aborts all reference updates if hook aborts' '
285 test_when_finished "rm -rf \"$D\"/atomic" &&
286
287 cd "$D" &&
288 git clone . atomic &&
289 git branch atomic-hooks-abort-1 &&
290 git branch atomic-hooks-abort-2 &&
291 git branch atomic-hooks-abort-3 &&
292 git tag atomic-hooks-abort &&
293 head_oid=$(git rev-parse HEAD) &&
294
295 cat >expected <<-EOF &&
296 prepared
297 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
298 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
299 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
300 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
301 aborted
302 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
303 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
304 $ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
305 $ZERO_OID $head_oid refs/tags/atomic-hooks-abort
306 EOF
307
308 rm -f atomic/actual &&
309 write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
310 ( echo "$*" && cat ) >>actual
311 exit 1
312 EOF
313
314 git -C atomic for-each-ref >expected-refs &&
315 test_must_fail git -C atomic fetch --tags --atomic origin &&
316 git -C atomic for-each-ref >actual-refs &&
317 test_cmp expected-refs actual-refs &&
318 test_must_be_empty atomic/.git/FETCH_HEAD
319'
320
321test_expect_success 'fetch --atomic --append appends to FETCH_HEAD' '
322 test_when_finished "rm -rf \"$D\"/atomic" &&
323
324 cd "$D" &&
325 git clone . atomic &&
326 oid=$(git rev-parse HEAD) &&
327
328 git branch atomic-fetch-head-1 &&
329 git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
330 test_line_count = 1 atomic/.git/FETCH_HEAD &&
331
332 git branch atomic-fetch-head-2 &&
333 git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
334 test_line_count = 2 atomic/.git/FETCH_HEAD &&
335 cp atomic/.git/FETCH_HEAD expected &&
336
337 write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
338 exit 1
339 EOF
340
341 git branch atomic-fetch-head-3 &&
342 test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
343 test_cmp expected atomic/.git/FETCH_HEAD
344'
345
b40a5026
DS
346test_expect_success '--refmap="" ignores configured refspec' '
347 cd "$TRASH_DIRECTORY" &&
348 git clone "$D" remote-refs &&
83ecf26e
JS
349 git -C remote-refs rev-parse remotes/origin/main >old &&
350 git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
351 git -C remote-refs rev-parse remotes/origin/main >new &&
b40a5026 352 git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
83ecf26e 353 git -C remote-refs rev-parse remotes/origin/main >actual &&
b40a5026
DS
354 test_cmp new actual &&
355 git -C remote-refs fetch origin &&
83ecf26e 356 git -C remote-refs rev-parse remotes/origin/main >actual &&
b40a5026
DS
357 test_cmp old actual
358'
359
360test_expect_success '--refmap="" and --prune' '
83ecf26e
JS
361 git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
362 git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
b40a5026
DS
363 git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
364 git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
365 test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
366 git -C remote-refs fetch --prune origin &&
367 test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
368'
369
f539d0d6
VJ
370test_expect_success 'fetch tags when there is no tags' '
371
372 cd "$D" &&
373
374 mkdir notags &&
375 cd notags &&
376 git init &&
377
378 git fetch -t ..
379
380'
381
6c96c0f1
JH
382test_expect_success 'fetch following tags' '
383
384 cd "$D" &&
c76b84a1 385 git tag -a -m "annotated" anno HEAD &&
6c96c0f1
JH
386 git tag light HEAD &&
387
388 mkdir four &&
389 cd four &&
5c94f87e 390 git init &&
6c96c0f1
JH
391
392 git fetch .. :track &&
393 git show-ref --verify refs/tags/anno &&
394 git show-ref --verify refs/tags/light
395
396'
397
0997adaa
MB
398test_expect_success 'fetch uses remote ref names to describe new refs' '
399 cd "$D" &&
400 git init descriptive &&
401 (
402 cd descriptive &&
403 git config remote.o.url .. &&
404 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
405 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
406 git fetch o
407 ) &&
408 git tag -a -m "Descriptive tag" descriptive-tag &&
409 git branch descriptive-branch &&
410 git checkout descriptive-branch &&
411 echo "Nuts" >crazy &&
412 git add crazy &&
413 git commit -a -m "descriptive commit" &&
414 git update-ref refs/others/crazy HEAD &&
415 (
416 cd descriptive &&
417 git fetch o 2>actual &&
927c1a64
SG
418 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
419 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
420 test_i18ngrep "new ref.* -> crazy$" actual
0997adaa 421 ) &&
83ecf26e 422 git checkout main
0997adaa
MB
423'
424
41ac414e 425test_expect_success 'fetch must not resolve short tag name' '
605b4978
SP
426
427 cd "$D" &&
428
429 mkdir five &&
430 cd five &&
431 git init &&
432
d492b31c 433 test_must_fail git fetch .. anno:five
605b4978
SP
434
435'
436
dd621df9 437test_expect_success 'fetch can now resolve short remote name' '
605b4978
SP
438
439 cd "$D" &&
a48fcd83 440 git update-ref refs/remotes/six/HEAD HEAD &&
605b4978
SP
441
442 mkdir six &&
443 cd six &&
444 git init &&
445
dd621df9 446 git fetch .. six:six
605b4978
SP
447'
448
2e0afafe
JS
449test_expect_success 'create bundle 1' '
450 cd "$D" &&
451 echo >file updated again by origin &&
452 git commit -a -m "tip" &&
83ecf26e 453 git bundle create --version=3 bundle1 main^..main
2e0afafe
JS
454'
455
8315588b 456test_expect_success 'header of bundle looks right' '
c5aecfc8 457 cat >expect <<-EOF &&
458 # v3 git bundle
459 @object-format=$(test_oid algo)
460 -OID updated by origin
83ecf26e 461 OID refs/heads/main
c5aecfc8 462
463 EOF
464 sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
465 test_cmp expect actual
8315588b
JS
466'
467
2e0afafe
JS
468test_expect_success 'create bundle 2' '
469 cd "$D" &&
83ecf26e 470 git bundle create bundle2 main~2..main
2e0afafe
JS
471'
472
41ac414e 473test_expect_success 'unbundle 1' '
2e0afafe
JS
474 cd "$D/bundle" &&
475 git checkout -b some-branch &&
83ecf26e 476 test_must_fail git fetch "$D/bundle1" main:main
2e0afafe
JS
477'
478
2e674a9d 479
8315588b
JS
480test_expect_success 'bundle 1 has only 3 files ' '
481 cd "$D" &&
9901164d 482 test_bundle_object_count bundle1 3
8315588b
JS
483'
484
2e0afafe
JS
485test_expect_success 'unbundle 2' '
486 cd "$D/bundle" &&
83ecf26e
JS
487 git fetch ../bundle2 main:main &&
488 test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
2e0afafe
JS
489'
490
18449ab0
JS
491test_expect_success 'bundle does not prerequisite objects' '
492 cd "$D" &&
493 touch file2 &&
494 git add file2 &&
495 git commit -m add.file2 file2 &&
496 git bundle create bundle3 -1 HEAD &&
9901164d 497 test_bundle_object_count bundle3 3
18449ab0
JS
498'
499
7fa8254f
JH
500test_expect_success 'bundle should be able to create a full history' '
501
502 cd "$D" &&
83ecf26e 503 git tag -a -m "1.0" v1.0 main &&
7fa8254f
JH
504 git bundle create bundle4 v1.0
505
506'
507
da0204df 508test_expect_success 'fetch with a non-applying branch.<name>.merge' '
83ecf26e
JS
509 git config branch.main.remote yeti &&
510 git config branch.main.merge refs/heads/bigfoot &&
da0204df
JS
511 git config remote.blub.url one &&
512 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
513 git fetch blub
514'
515
042cca38
BC
516# URL supplied to fetch does not match the url of the configured branch's remote
517test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
518 one_head=$(cd one && git rev-parse HEAD) &&
519 this_head=$(git rev-parse HEAD) &&
6106ce46
BC
520 git update-ref -d FETCH_HEAD &&
521 git fetch one &&
042cca38
BC
522 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
523 test $this_head = "$(git rev-parse --verify HEAD)"
524'
525
526# URL supplied to fetch matches the url of the configured branch's remote and
527# the merge spec matches the branch the remote HEAD points to
528test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
529 one_ref=$(cd one && git symbolic-ref HEAD) &&
83ecf26e
JS
530 git config branch.main.remote blub &&
531 git config branch.main.merge "$one_ref" &&
042cca38
BC
532 git update-ref -d FETCH_HEAD &&
533 git fetch one &&
534 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
535 test $this_head = "$(git rev-parse --verify HEAD)"
536'
537
538# URL supplied to fetch matches the url of the configured branch's remote, but
539# the merge spec does not match the branch the remote HEAD points to
540test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
83ecf26e 541 git config branch.main.merge "${one_ref}_not" &&
042cca38
BC
542 git update-ref -d FETCH_HEAD &&
543 git fetch one &&
544 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
545 test $this_head = "$(git rev-parse --verify HEAD)"
6106ce46
BC
546'
547
c2015b3a
JS
548# the strange name is: a\!'b
549test_expect_success 'quoting of a strangely named repo' '
d492b31c 550 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
c2015b3a
JS
551 grep "fatal: '\''a\\\\!'\''b'\''" result
552'
553
c5546e88
JS
554test_expect_success 'bundle should record HEAD correctly' '
555
556 cd "$D" &&
83ecf26e 557 git bundle create bundle5 HEAD main &&
c5546e88 558 git bundle list-heads bundle5 >actual &&
83ecf26e 559 for h in HEAD refs/heads/main
c5546e88 560 do
d0fd9931 561 echo "$(git rev-parse --verify $h) $h" || return 1
c5546e88 562 done >expect &&
82ebb0b6 563 test_cmp expect actual
c5546e88
JS
564
565'
566
83ecf26e 567test_expect_success 'mark initial state of origin/main' '
51f8c814
JK
568 (
569 cd three &&
83ecf26e 570 git tag base-origin-main refs/remotes/origin/main
51f8c814
JK
571 )
572'
573
f2690487 574test_expect_success 'explicit fetch should update tracking' '
c7015961
JH
575
576 cd "$D" &&
577 git branch -f side &&
578 (
579 cd three &&
83ecf26e
JS
580 git update-ref refs/remotes/origin/main base-origin-main &&
581 o=$(git rev-parse --verify refs/remotes/origin/main) &&
582 git fetch origin main &&
583 n=$(git rev-parse --verify refs/remotes/origin/main) &&
f2690487 584 test "$o" != "$n" &&
d492b31c 585 test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961
JH
586 )
587'
588
f2690487 589test_expect_success 'explicit pull should update tracking' '
c7015961
JH
590
591 cd "$D" &&
592 git branch -f side &&
593 (
594 cd three &&
83ecf26e
JS
595 git update-ref refs/remotes/origin/main base-origin-main &&
596 o=$(git rev-parse --verify refs/remotes/origin/main) &&
597 git pull origin main &&
598 n=$(git rev-parse --verify refs/remotes/origin/main) &&
f2690487 599 test "$o" != "$n" &&
d492b31c 600 test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961
JH
601 )
602'
603
c5558f80
JH
604test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
605 cd "$D" &&
606 (
607 cd three &&
608 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
609 )
610'
611
612test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
613 cd "$D" &&
614 git branch -f side &&
615 (
616 cd three &&
83ecf26e
JS
617 git update-ref refs/remotes/origin/main base-origin-main &&
618 o=$(git rev-parse --verify refs/remotes/origin/main) &&
619 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
620 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c5558f80
JH
621 test "$o" = "$n" &&
622 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
83ecf26e 623 git rev-parse --verify refs/remotes/other/main
c5558f80
JH
624 )
625'
626
627test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
628 cd "$D" &&
629 git branch -f side &&
630 (
631 cd three &&
83ecf26e
JS
632 git update-ref refs/remotes/origin/main base-origin-main &&
633 o=$(git rev-parse --verify refs/remotes/origin/main) &&
634 git fetch --refmap="" origin main &&
635 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c5558f80
JH
636 test "$o" = "$n" &&
637 test_must_fail git rev-parse --verify refs/remotes/origin/side
638 )
639'
640
c7015961
JH
641test_expect_success 'configured fetch updates tracking' '
642
643 cd "$D" &&
644 git branch -f side &&
645 (
646 cd three &&
83ecf26e
JS
647 git update-ref refs/remotes/origin/main base-origin-main &&
648 o=$(git rev-parse --verify refs/remotes/origin/main) &&
c7015961 649 git fetch origin &&
83ecf26e 650 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c7015961
JH
651 test "$o" != "$n" &&
652 git rev-parse --verify refs/remotes/origin/side
653 )
654'
655
823c6d56
JK
656test_expect_success 'non-matching refspecs do not confuse tracking update' '
657 cd "$D" &&
658 git update-ref refs/odd/location HEAD &&
659 (
660 cd three &&
83ecf26e 661 git update-ref refs/remotes/origin/main base-origin-main &&
823c6d56
JK
662 git config --add remote.origin.fetch \
663 refs/odd/location:refs/remotes/origin/odd &&
83ecf26e
JS
664 o=$(git rev-parse --verify refs/remotes/origin/main) &&
665 git fetch origin main &&
666 n=$(git rev-parse --verify refs/remotes/origin/main) &&
823c6d56
JK
667 test "$o" != "$n" &&
668 test_must_fail git rev-parse --verify refs/remotes/origin/odd
669 )
670'
671
9a7bbd1d
JK
672test_expect_success 'pushing nonexistent branch by mistake should not segv' '
673
674 cd "$D" &&
675 test_must_fail git push seven no:no
676
677'
678
49420252
JH
679test_expect_success 'auto tag following fetches minimum' '
680
681 cd "$D" &&
682 git clone .git follow &&
683 git checkout HEAD^0 &&
684 (
685 for i in 1 2 3 4 5 6 7
686 do
687 echo $i >>file &&
688 git commit -m $i -a &&
689 git tag -a -m $i excess-$i || exit 1
690 done
691 ) &&
83ecf26e 692 git checkout main &&
49420252
JH
693 (
694 cd follow &&
695 git fetch
696 )
697'
698
8ee5d731
JS
699test_expect_success 'refuse to fetch into the current branch' '
700
83ecf26e 701 test_must_fail git fetch . side:main
8ee5d731
JS
702
703'
704
705test_expect_success 'fetch into the current branch with --update-head-ok' '
706
83ecf26e 707 git fetch --update-head-ok . side:main
8ee5d731
JS
708
709'
710
db3c293e
JT
711test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
712 rm -f .git/FETCH_HEAD err &&
713 git fetch --dry-run . 2>err &&
714 ! test -f .git/FETCH_HEAD &&
715 grep FETCH_HEAD err
716'
717
718test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
719 rm -f .git/FETCH_HEAD err &&
720 git fetch --no-write-fetch-head . 2>err &&
721 ! test -f .git/FETCH_HEAD &&
722 ! grep FETCH_HEAD err
887952b8
JH
723'
724
725test_expect_success '--write-fetch-head gets defeated by --dry-run' '
726 rm -f .git/FETCH_HEAD &&
727 git fetch --dry-run --write-fetch-head . &&
728 ! test -f .git/FETCH_HEAD
729'
730
95c96d48 731test_expect_success "should be able to fetch with duplicate refspecs" '
aa982856
TR
732 mkdir dups &&
733 (
734 cd dups &&
735 git init &&
83ecf26e 736 git config branch.main.remote three &&
aa982856
TR
737 git config remote.three.url ../three/.git &&
738 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
739 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
740 git fetch three
741 )
95c96d48
JP
742'
743
60650a48
JH
744test_expect_success 'LHS of refspec follows ref disambiguation rules' '
745 mkdir lhs-ambiguous &&
746 (
747 cd lhs-ambiguous &&
748 git init server &&
749 test_commit -C server unwanted &&
750 test_commit -C server wanted &&
751
752 git init client &&
753
754 # Check a name coming after "refs" alphabetically ...
755 git -C server update-ref refs/heads/s wanted &&
756 git -C server update-ref refs/heads/refs/heads/s unwanted &&
757 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
758 git -C server rev-parse wanted >expect &&
759 git -C client rev-parse checkthis >actual &&
760 test_cmp expect actual &&
761
762 # ... and one before.
763 git -C server update-ref refs/heads/q wanted &&
764 git -C server update-ref refs/heads/refs/heads/q unwanted &&
765 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
766 git -C server rev-parse wanted >expect &&
767 git -C client rev-parse checkthis >actual &&
768 test_cmp expect actual &&
769
770 # Tags are preferred over branches like refs/{heads,tags}/*
771 git -C server update-ref refs/tags/t wanted &&
772 git -C server update-ref refs/heads/t unwanted &&
773 git -C client fetch ../server +t:refs/heads/checkthis &&
774 git -C server rev-parse wanted >expect &&
775 git -C client rev-parse checkthis >actual
776 )
777'
778
50f26bd0
DS
779test_expect_success 'fetch.writeCommitGraph' '
780 git clone three write &&
781 (
782 cd three &&
783 test_commit new
784 ) &&
785 (
786 cd write &&
787 git -c fetch.writeCommitGraph fetch origin &&
788 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
789 )
790'
791
cb99a34e 792test_expect_success 'fetch.writeCommitGraph with submodules' '
e88aab91
DS
793 git clone dups super &&
794 (
795 cd super &&
796 git submodule add "file://$TRASH_DIRECTORY/three" &&
797 git commit -m "add submodule"
798 ) &&
799 git clone "super" super-clone &&
800 (
801 cd super-clone &&
802 rm -rf .git/objects/info &&
803 git -c fetch.writeCommitGraph=true fetch origin &&
804 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
805 )
806'
807
737c5a9c
MS
808# configured prune tests
809
810set_config_tristate () {
811 # var=$1 val=$2
812 case "$2" in
59caf52d
ÆAB
813 unset)
814 test_unconfig "$1"
815 ;;
816 *)
817 git config "$1" "$2"
e1790f92
ÆAB
818 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
819 git_fetch_c="$git_fetch_c -c $key=$2"
59caf52d 820 ;;
737c5a9c
MS
821 esac
822}
823
824test_configured_prune () {
e1790f92
ÆAB
825 test_configured_prune_type "$@" "name"
826 test_configured_prune_type "$@" "link"
827}
737c5a9c 828
e1790f92 829test_configured_prune_type () {
eca142d3
ÆAB
830 fetch_prune=$1
831 remote_origin_prune=$2
e249ce0c
ÆAB
832 fetch_prune_tags=$3
833 remote_origin_prune_tags=$4
834 expected_branch=$5
835 expected_tag=$6
836 cmdline=$7
837 mode=$8
e1790f92
ÆAB
838
839 if test -z "$cmdline_setup"
840 then
841 test_expect_success 'setup cmdline_setup variable for subsequent test' '
842 remote_url="file://$(git -C one config remote.origin.url)" &&
843 remote_fetch="$(git -C one config remote.origin.fetch)" &&
844 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
845 '
846 fi
847
848 if test "$mode" = 'link'
849 then
850 new_cmdline=""
851
852 if test "$cmdline" = ""
853 then
854 new_cmdline=$cmdline_setup
855 else
856 new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
857 fi
858
97716d21
ÆAB
859 if test "$fetch_prune_tags" = 'true' ||
860 test "$remote_origin_prune_tags" = 'true'
861 then
862 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
863 then
864 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
865 fi
866 fi
867
e1790f92
ÆAB
868 cmdline="$new_cmdline"
869 fi
870
e249ce0c 871 test_expect_success "$mode prune fetch.prune=$1 remote.origin.prune=$2 fetch.pruneTags=$3 remote.origin.pruneTags=$4${7:+ $7}; branch:$5 tag:$6" '
737c5a9c
MS
872 # make sure a newbranch is there in . and also in one
873 git branch -f newbranch &&
ca3065e7 874 git tag -f newtag &&
737c5a9c
MS
875 (
876 cd one &&
877 test_unconfig fetch.prune &&
e249ce0c 878 test_unconfig fetch.pruneTags &&
737c5a9c 879 test_unconfig remote.origin.prune &&
e249ce0c 880 test_unconfig remote.origin.pruneTags &&
e1790f92 881 git fetch '"$cmdline_setup"' &&
ca3065e7
ÆAB
882 git rev-parse --verify refs/remotes/origin/newbranch &&
883 git rev-parse --verify refs/tags/newtag
99094a7a 884 ) &&
737c5a9c 885
d3651121 886 # now remove them
737c5a9c 887 git branch -d newbranch &&
ca3065e7 888 git tag -d newtag &&
737c5a9c
MS
889
890 # then test
891 (
892 cd one &&
e1790f92 893 git_fetch_c="" &&
737c5a9c 894 set_config_tristate fetch.prune $fetch_prune &&
e249ce0c 895 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
737c5a9c 896 set_config_tristate remote.origin.prune $remote_origin_prune &&
e249ce0c 897 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
737c5a9c 898
e1790f92
ÆAB
899 if test "$mode" != "link"
900 then
901 git_fetch_c=""
902 fi &&
903 git$git_fetch_c fetch '"$cmdline"' &&
eca142d3 904 case "$expected_branch" in
737c5a9c
MS
905 pruned)
906 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
907 ;;
908 kept)
909 git rev-parse --verify refs/remotes/origin/newbranch
910 ;;
ca3065e7
ÆAB
911 esac &&
912 case "$expected_tag" in
913 pruned)
914 test_must_fail git rev-parse --verify refs/tags/newtag
915 ;;
916 kept)
917 git rev-parse --verify refs/tags/newtag
918 ;;
737c5a9c
MS
919 esac
920 )
921 '
922}
923
bf16ab79
ÆAB
924# $1 config: fetch.prune
925# $2 config: remote.<name>.prune
e249ce0c
ÆAB
926# $3 config: fetch.pruneTags
927# $4 config: remote.<name>.pruneTags
928# $5 expect: branch to be pruned?
929# $6 expect: tag to be pruned?
930# $7 git-fetch $cmdline:
bf16ab79 931#
e249ce0c
ÆAB
932# $1 $2 $3 $4 $5 $6 $7
933test_configured_prune unset unset unset unset kept kept ""
934test_configured_prune unset unset unset unset kept kept "--no-prune"
935test_configured_prune unset unset unset unset pruned kept "--prune"
936test_configured_prune unset unset unset unset kept pruned \
6fb23f56 937 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 938test_configured_prune unset unset unset unset pruned pruned \
6fb23f56 939 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
ca3065e7 940
e249ce0c
ÆAB
941test_configured_prune false unset unset unset kept kept ""
942test_configured_prune false unset unset unset kept kept "--no-prune"
943test_configured_prune false unset unset unset pruned kept "--prune"
ca3065e7 944
e249ce0c
ÆAB
945test_configured_prune true unset unset unset pruned kept ""
946test_configured_prune true unset unset unset pruned kept "--prune"
947test_configured_prune true unset unset unset kept kept "--no-prune"
ca3065e7 948
e249ce0c
ÆAB
949test_configured_prune unset false unset unset kept kept ""
950test_configured_prune unset false unset unset kept kept "--no-prune"
951test_configured_prune unset false unset unset pruned kept "--prune"
ca3065e7 952
e249ce0c
ÆAB
953test_configured_prune false false unset unset kept kept ""
954test_configured_prune false false unset unset kept kept "--no-prune"
955test_configured_prune false false unset unset pruned kept "--prune"
956test_configured_prune false false unset unset kept pruned \
6fb23f56 957 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 958test_configured_prune false false unset unset pruned pruned \
6fb23f56 959 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
ca3065e7 960
e249ce0c
ÆAB
961test_configured_prune true false unset unset kept kept ""
962test_configured_prune true false unset unset pruned kept "--prune"
963test_configured_prune true false unset unset kept kept "--no-prune"
ca3065e7 964
e249ce0c
ÆAB
965test_configured_prune unset true unset unset pruned kept ""
966test_configured_prune unset true unset unset kept kept "--no-prune"
967test_configured_prune unset true unset unset pruned kept "--prune"
ca3065e7 968
e249ce0c
ÆAB
969test_configured_prune false true unset unset pruned kept ""
970test_configured_prune false true unset unset kept kept "--no-prune"
971test_configured_prune false true unset unset pruned kept "--prune"
ca3065e7 972
e249ce0c
ÆAB
973test_configured_prune true true unset unset pruned kept ""
974test_configured_prune true true unset unset pruned kept "--prune"
975test_configured_prune true true unset unset kept kept "--no-prune"
976test_configured_prune true true unset unset kept pruned \
6fb23f56 977 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 978test_configured_prune true true unset unset pruned pruned \
6fb23f56 979 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
737c5a9c 980
97716d21 981# --prune-tags on its own does nothing, needs --prune as well, same
6d12b533 982# for fetch.pruneTags without fetch.prune
97716d21
ÆAB
983test_configured_prune unset unset unset unset kept kept "--prune-tags"
984test_configured_prune unset unset true unset kept kept ""
985test_configured_prune unset unset unset true kept kept ""
986
987# These will prune the tags
988test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
989test_configured_prune true unset true unset pruned pruned ""
990test_configured_prune unset true unset true pruned pruned ""
991
992# remote.<name>.pruneTags overrides fetch.pruneTags, just like
993# remote.<name>.prune overrides fetch.prune if set.
994test_configured_prune true unset true unset pruned pruned ""
995test_configured_prune false true false true pruned pruned ""
996test_configured_prune true false true false kept kept ""
997
998# When --prune-tags is supplied it's ignored if an explicit refspec is
999# given, same for the configuration options.
1000test_configured_prune unset unset unset unset pruned kept \
1001 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
1002test_configured_prune unset unset true unset pruned kept \
1003 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1004test_configured_prune unset unset unset true pruned kept \
1005 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1006
1007# Pruning that also takes place if a file:// url replaces a named
6317972c 1008# remote. However, because there's no implicit
97716d21
ÆAB
1009# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
1010# command-line negates --prune-tags, the branches will not be pruned.
1011test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
1012test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
1013test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
6317972c 1014test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
97716d21 1015test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
6317972c 1016test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
97716d21
ÆAB
1017test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
1018test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
1019test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
1020test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
1021test_configured_prune_type true unset true unset pruned pruned "origin" "name"
1022test_configured_prune_type true unset true unset kept pruned "origin" "link"
1023test_configured_prune_type unset true true unset pruned pruned "origin" "name"
1024test_configured_prune_type unset true true unset kept pruned "origin" "link"
1025test_configured_prune_type unset true unset true pruned pruned "origin" "name"
1026test_configured_prune_type unset true unset true kept pruned "origin" "link"
1027
6317972c
ÆAB
1028# When all remote.origin.fetch settings are deleted a --prune
1029# --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
1030# tags, but not tracking branches, will be deleted.
97716d21
ÆAB
1031test_expect_success 'remove remote.origin.fetch "one"' '
1032 (
1033 cd one &&
1034 git config --unset-all remote.origin.fetch
1035 )
1036'
1037test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
6317972c 1038test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
737c5a9c 1039
efe4be12
TR
1040test_expect_success 'all boundary commits are excluded' '
1041 test_commit base &&
1042 test_commit oneside &&
1043 git checkout HEAD^ &&
1044 test_commit otherside &&
83ecf26e 1045 git checkout main &&
efe4be12
TR
1046 test_tick &&
1047 git merge otherside &&
1048 ad=$(git log --no-walk --format=%ad HEAD) &&
83ecf26e 1049 git bundle create twoside-boundary.bdl main --since="$ad" &&
9901164d 1050 test_bundle_object_count --thin twoside-boundary.bdl 3
95c96d48
JP
1051'
1052
4b3b33a7
TM
1053test_expect_success 'fetch --prune prints the remotes url' '
1054 git branch goodbye &&
1055 git clone . only-prunes &&
1056 git branch -D goodbye &&
1057 (
1058 cd only-prunes &&
1059 git fetch --prune origin 2>&1 | head -n1 >../actual
1060 ) &&
1061 echo "From ${D}/." >expect &&
1108cea7 1062 test_cmp expect actual
4b3b33a7
TM
1063'
1064
10a6cc88
TM
1065test_expect_success 'branchname D/F conflict resolved by --prune' '
1066 git branch dir/file &&
1067 git clone . prune-df-conflict &&
1068 git branch -D dir/file &&
1069 git branch dir &&
1070 (
1071 cd prune-df-conflict &&
1072 git fetch --prune &&
1073 git rev-parse origin/dir >../actual
1074 ) &&
1075 git rev-parse dir >expect &&
1076 test_cmp expect actual
1077'
1078
4c224081
JK
1079test_expect_success 'fetching a one-level ref works' '
1080 test_commit extra &&
1081 git reset --hard HEAD^ &&
1082 git update-ref refs/foo extra &&
1083 git init one-level &&
1084 (
1085 cd one-level &&
1086 git fetch .. HEAD refs/foo
1087 )
1088'
1089
0898c962
JS
1090test_expect_success 'fetching with auto-gc does not lock up' '
1091 write_script askyesno <<-\EOF &&
1092 echo "$*" &&
1093 false
1094 EOF
1095 git clone "file://$D" auto-gc &&
1096 test_commit test2 &&
816c1930
MG
1097 (
1098 cd auto-gc &&
12e73a3c 1099 git config fetch.unpackLimit 1 &&
816c1930 1100 git config gc.autoPackLimit 1 &&
bb05510e 1101 git config gc.autoDetach false &&
a95ce124 1102 GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
12e73a3c 1103 test_i18ngrep "Auto packing the repository" fetch.out &&
816c1930
MG
1104 ! grep "Should I try again" fetch.out
1105 )
0898c962
JS
1106'
1107
a926c4b9 1108test_expect_success 'fetch aligned output' '
6bc91f23
NTND
1109 git clone . full-output &&
1110 test_commit looooooooooooong-tag &&
1111 (
1112 cd full-output &&
a4d4e32a
PK
1113 git -c fetch.output=full fetch origin >actual 2>&1 &&
1114 grep -e "->" actual | cut -c 22- >../actual
6bc91f23
NTND
1115 ) &&
1116 cat >expect <<-\EOF &&
66713e84 1117 main -> origin/main
6bc91f23
NTND
1118 looooooooooooong-tag -> looooooooooooong-tag
1119 EOF
1120 test_cmp expect actual
1121'
1122
a926c4b9 1123test_expect_success 'fetch compact output' '
bc437d10
NTND
1124 git clone . compact &&
1125 test_commit extraaa &&
1126 (
1127 cd compact &&
a4d4e32a
PK
1128 git -c fetch.output=compact fetch origin >actual 2>&1 &&
1129 grep -e "->" actual | cut -c 22- >../actual
bc437d10
NTND
1130 ) &&
1131 cat >expect <<-\EOF &&
66713e84 1132 main -> origin/*
bc437d10
NTND
1133 extraaa -> *
1134 EOF
1135 test_cmp expect actual
1136'
1137
12b18266
SG
1138test_expect_success '--no-show-forced-updates' '
1139 mkdir forced-updates &&
1140 (
1141 cd forced-updates &&
1142 git init &&
1143 test_commit 1 &&
1144 test_commit 2
1145 ) &&
1146 git clone forced-updates forced-update-clone &&
1147 git clone forced-updates no-forced-update-clone &&
1148 git -C forced-updates reset --hard HEAD~1 &&
1149 (
1150 cd forced-update-clone &&
1151 git fetch --show-forced-updates origin 2>output &&
1152 test_i18ngrep "(forced update)" output
1153 ) &&
1154 (
1155 cd no-forced-update-clone &&
1156 git fetch --no-show-forced-updates origin 2>output &&
1157 test_i18ngrep ! "(forced update)" output
1158 )
1159'
1160
3390e42a
JT
1161setup_negotiation_tip () {
1162 SERVER="$1"
1163 URL="$2"
1164 USE_PROTOCOL_V2="$3"
1165
1166 rm -rf "$SERVER" client trace &&
83ecf26e 1167 git init -b main "$SERVER" &&
3390e42a
JT
1168 test_commit -C "$SERVER" alpha_1 &&
1169 test_commit -C "$SERVER" alpha_2 &&
1170 git -C "$SERVER" checkout --orphan beta &&
1171 test_commit -C "$SERVER" beta_1 &&
1172 test_commit -C "$SERVER" beta_2 &&
1173
1174 git clone "$URL" client &&
1175
1176 if test "$USE_PROTOCOL_V2" -eq 1
1177 then
1178 git -C "$SERVER" config protocol.version 2 &&
1179 git -C client config protocol.version 2
1180 fi &&
1181
1182 test_commit -C "$SERVER" beta_s &&
83ecf26e 1183 git -C "$SERVER" checkout main &&
3390e42a
JT
1184 test_commit -C "$SERVER" alpha_s &&
1185 git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
1186}
1187
1188check_negotiation_tip () {
1189 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
1190 ALPHA_1=$(git -C client rev-parse alpha_1) &&
1191 grep "fetch> have $ALPHA_1" trace &&
1192 BETA_1=$(git -C client rev-parse beta_1) &&
1193 grep "fetch> have $BETA_1" trace &&
1194 ALPHA_2=$(git -C client rev-parse alpha_2) &&
1195 ! grep "fetch> have $ALPHA_2" trace &&
1196 BETA_2=$(git -C client rev-parse beta_2) &&
1197 ! grep "fetch> have $BETA_2" trace
1198}
1199
1200test_expect_success '--negotiation-tip limits "have" lines sent' '
1201 setup_negotiation_tip server server 0 &&
1202 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1203 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1204 origin alpha_s beta_s &&
1205 check_negotiation_tip
1206'
1207
1208test_expect_success '--negotiation-tip understands globs' '
1209 setup_negotiation_tip server server 0 &&
1210 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1211 --negotiation-tip=*_1 \
1212 origin alpha_s beta_s &&
1213 check_negotiation_tip
1214'
1215
1216test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
1217 setup_negotiation_tip server server 0 &&
1218 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1219 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1220 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1221 origin alpha_s beta_s &&
1222 check_negotiation_tip
1223'
1224
82823118
JT
1225test_expect_success '--negotiation-tip rejects missing OIDs' '
1226 setup_negotiation_tip server server 0 &&
1227 test_must_fail git -C client fetch \
1228 --negotiation-tip=alpha_1 \
1229 --negotiation-tip=$(test_oid zero) \
1230 origin alpha_s beta_s 2>err &&
1231 cat >fatal-expect <<-EOF &&
1232 fatal: the object $(test_oid zero) does not exist
1233EOF
1234 grep fatal: err >fatal-actual &&
1235 test_cmp fatal-expect fatal-actual
1236'
1237
3390e42a
JT
1238. "$TEST_DIRECTORY"/lib-httpd.sh
1239start_httpd
1240
1241test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1242 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1243 "$HTTPD_URL/smart/server" 1 &&
1244 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1245 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1246 origin alpha_s beta_s &&
1247 check_negotiation_tip
1248'
1249
12b18266
SG
1250# DO NOT add non-httpd-specific tests here, because the last part of this
1251# test script is only executed when httpd is available and enabled.
cdbd70c4 1252
7be1d62c 1253test_done