]> git.ipfire.org Git - thirdparty/git.git/blame - t/t5510-fetch.sh
fetch: make `--atomic` flag cover backfilling of tags
[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
2a0cafd4
PS
346test_expect_success 'fetch --atomic --prune executes a single reference transaction only' '
347 test_when_finished "rm -rf \"$D\"/atomic" &&
348
349 cd "$D" &&
350 git branch scheduled-for-deletion &&
351 git clone . atomic &&
352 git branch -D scheduled-for-deletion &&
353 git branch new-branch &&
354 head_oid=$(git rev-parse HEAD) &&
355
356 # Fetching with the `--atomic` flag should update all references in a
357 # single transaction. It is currently missing coverage of pruned
358 # references though, and as a result those may be committed to disk
359 # even if updating references fails later.
360 cat >expected <<-EOF &&
361 prepared
362 $ZERO_OID $ZERO_OID refs/remotes/origin/scheduled-for-deletion
363 committed
364 $ZERO_OID $ZERO_OID refs/remotes/origin/scheduled-for-deletion
365 prepared
366 $ZERO_OID $head_oid refs/remotes/origin/new-branch
367 committed
368 $ZERO_OID $head_oid refs/remotes/origin/new-branch
369 EOF
370
371 write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
372 ( echo "$*" && cat ) >>actual
373 EOF
374
375 git -C atomic fetch --atomic --prune origin &&
376 test_cmp expected atomic/actual
377'
378
b40a5026
DS
379test_expect_success '--refmap="" ignores configured refspec' '
380 cd "$TRASH_DIRECTORY" &&
381 git clone "$D" remote-refs &&
83ecf26e
JS
382 git -C remote-refs rev-parse remotes/origin/main >old &&
383 git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
384 git -C remote-refs rev-parse remotes/origin/main >new &&
b40a5026 385 git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
83ecf26e 386 git -C remote-refs rev-parse remotes/origin/main >actual &&
b40a5026
DS
387 test_cmp new actual &&
388 git -C remote-refs fetch origin &&
83ecf26e 389 git -C remote-refs rev-parse remotes/origin/main >actual &&
b40a5026
DS
390 test_cmp old actual
391'
392
393test_expect_success '--refmap="" and --prune' '
83ecf26e
JS
394 git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
395 git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
b40a5026
DS
396 git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
397 git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
398 test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
399 git -C remote-refs fetch --prune origin &&
400 test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
401'
402
f539d0d6
VJ
403test_expect_success 'fetch tags when there is no tags' '
404
405 cd "$D" &&
406
407 mkdir notags &&
408 cd notags &&
409 git init &&
410
411 git fetch -t ..
412
413'
414
6c96c0f1
JH
415test_expect_success 'fetch following tags' '
416
417 cd "$D" &&
c76b84a1 418 git tag -a -m "annotated" anno HEAD &&
6c96c0f1
JH
419 git tag light HEAD &&
420
421 mkdir four &&
422 cd four &&
5c94f87e 423 git init &&
6c96c0f1
JH
424
425 git fetch .. :track &&
426 git show-ref --verify refs/tags/anno &&
427 git show-ref --verify refs/tags/light
428
429'
430
0997adaa
MB
431test_expect_success 'fetch uses remote ref names to describe new refs' '
432 cd "$D" &&
433 git init descriptive &&
434 (
435 cd descriptive &&
436 git config remote.o.url .. &&
437 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
438 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
439 git fetch o
440 ) &&
441 git tag -a -m "Descriptive tag" descriptive-tag &&
442 git branch descriptive-branch &&
443 git checkout descriptive-branch &&
444 echo "Nuts" >crazy &&
445 git add crazy &&
446 git commit -a -m "descriptive commit" &&
447 git update-ref refs/others/crazy HEAD &&
448 (
449 cd descriptive &&
450 git fetch o 2>actual &&
927c1a64
SG
451 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
452 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
453 test_i18ngrep "new ref.* -> crazy$" actual
0997adaa 454 ) &&
83ecf26e 455 git checkout main
0997adaa
MB
456'
457
41ac414e 458test_expect_success 'fetch must not resolve short tag name' '
605b4978
SP
459
460 cd "$D" &&
461
462 mkdir five &&
463 cd five &&
464 git init &&
465
d492b31c 466 test_must_fail git fetch .. anno:five
605b4978
SP
467
468'
469
dd621df9 470test_expect_success 'fetch can now resolve short remote name' '
605b4978
SP
471
472 cd "$D" &&
a48fcd83 473 git update-ref refs/remotes/six/HEAD HEAD &&
605b4978
SP
474
475 mkdir six &&
476 cd six &&
477 git init &&
478
dd621df9 479 git fetch .. six:six
605b4978
SP
480'
481
2e0afafe
JS
482test_expect_success 'create bundle 1' '
483 cd "$D" &&
484 echo >file updated again by origin &&
485 git commit -a -m "tip" &&
83ecf26e 486 git bundle create --version=3 bundle1 main^..main
2e0afafe
JS
487'
488
8315588b 489test_expect_success 'header of bundle looks right' '
c5aecfc8 490 cat >expect <<-EOF &&
491 # v3 git bundle
492 @object-format=$(test_oid algo)
493 -OID updated by origin
83ecf26e 494 OID refs/heads/main
c5aecfc8 495
496 EOF
497 sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
498 test_cmp expect actual
8315588b
JS
499'
500
2e0afafe
JS
501test_expect_success 'create bundle 2' '
502 cd "$D" &&
83ecf26e 503 git bundle create bundle2 main~2..main
2e0afafe
JS
504'
505
41ac414e 506test_expect_success 'unbundle 1' '
2e0afafe
JS
507 cd "$D/bundle" &&
508 git checkout -b some-branch &&
83ecf26e 509 test_must_fail git fetch "$D/bundle1" main:main
2e0afafe
JS
510'
511
2e674a9d 512
8315588b
JS
513test_expect_success 'bundle 1 has only 3 files ' '
514 cd "$D" &&
9901164d 515 test_bundle_object_count bundle1 3
8315588b
JS
516'
517
2e0afafe
JS
518test_expect_success 'unbundle 2' '
519 cd "$D/bundle" &&
83ecf26e
JS
520 git fetch ../bundle2 main:main &&
521 test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
2e0afafe
JS
522'
523
18449ab0
JS
524test_expect_success 'bundle does not prerequisite objects' '
525 cd "$D" &&
526 touch file2 &&
527 git add file2 &&
528 git commit -m add.file2 file2 &&
529 git bundle create bundle3 -1 HEAD &&
9901164d 530 test_bundle_object_count bundle3 3
18449ab0
JS
531'
532
7fa8254f
JH
533test_expect_success 'bundle should be able to create a full history' '
534
535 cd "$D" &&
83ecf26e 536 git tag -a -m "1.0" v1.0 main &&
7fa8254f
JH
537 git bundle create bundle4 v1.0
538
539'
540
da0204df 541test_expect_success 'fetch with a non-applying branch.<name>.merge' '
83ecf26e
JS
542 git config branch.main.remote yeti &&
543 git config branch.main.merge refs/heads/bigfoot &&
da0204df
JS
544 git config remote.blub.url one &&
545 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
546 git fetch blub
547'
548
042cca38
BC
549# URL supplied to fetch does not match the url of the configured branch's remote
550test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
551 one_head=$(cd one && git rev-parse HEAD) &&
552 this_head=$(git rev-parse HEAD) &&
6106ce46
BC
553 git update-ref -d FETCH_HEAD &&
554 git fetch one &&
042cca38
BC
555 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
556 test $this_head = "$(git rev-parse --verify HEAD)"
557'
558
559# URL supplied to fetch matches the url of the configured branch's remote and
560# the merge spec matches the branch the remote HEAD points to
561test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
562 one_ref=$(cd one && git symbolic-ref HEAD) &&
83ecf26e
JS
563 git config branch.main.remote blub &&
564 git config branch.main.merge "$one_ref" &&
042cca38
BC
565 git update-ref -d FETCH_HEAD &&
566 git fetch one &&
567 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
568 test $this_head = "$(git rev-parse --verify HEAD)"
569'
570
571# URL supplied to fetch matches the url of the configured branch's remote, but
572# the merge spec does not match the branch the remote HEAD points to
573test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
83ecf26e 574 git config branch.main.merge "${one_ref}_not" &&
042cca38
BC
575 git update-ref -d FETCH_HEAD &&
576 git fetch one &&
577 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
578 test $this_head = "$(git rev-parse --verify HEAD)"
6106ce46
BC
579'
580
c2015b3a
JS
581# the strange name is: a\!'b
582test_expect_success 'quoting of a strangely named repo' '
d492b31c 583 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
c2015b3a
JS
584 grep "fatal: '\''a\\\\!'\''b'\''" result
585'
586
c5546e88
JS
587test_expect_success 'bundle should record HEAD correctly' '
588
589 cd "$D" &&
83ecf26e 590 git bundle create bundle5 HEAD main &&
c5546e88 591 git bundle list-heads bundle5 >actual &&
83ecf26e 592 for h in HEAD refs/heads/main
c5546e88 593 do
d0fd9931 594 echo "$(git rev-parse --verify $h) $h" || return 1
c5546e88 595 done >expect &&
82ebb0b6 596 test_cmp expect actual
c5546e88
JS
597
598'
599
83ecf26e 600test_expect_success 'mark initial state of origin/main' '
51f8c814
JK
601 (
602 cd three &&
83ecf26e 603 git tag base-origin-main refs/remotes/origin/main
51f8c814
JK
604 )
605'
606
f2690487 607test_expect_success 'explicit fetch should update tracking' '
c7015961
JH
608
609 cd "$D" &&
610 git branch -f side &&
611 (
612 cd three &&
83ecf26e
JS
613 git update-ref refs/remotes/origin/main base-origin-main &&
614 o=$(git rev-parse --verify refs/remotes/origin/main) &&
615 git fetch origin main &&
616 n=$(git rev-parse --verify refs/remotes/origin/main) &&
f2690487 617 test "$o" != "$n" &&
d492b31c 618 test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961
JH
619 )
620'
621
f2690487 622test_expect_success 'explicit pull should update tracking' '
c7015961
JH
623
624 cd "$D" &&
625 git branch -f side &&
626 (
627 cd three &&
83ecf26e
JS
628 git update-ref refs/remotes/origin/main base-origin-main &&
629 o=$(git rev-parse --verify refs/remotes/origin/main) &&
630 git pull origin main &&
631 n=$(git rev-parse --verify refs/remotes/origin/main) &&
f2690487 632 test "$o" != "$n" &&
d492b31c 633 test_must_fail git rev-parse --verify refs/remotes/origin/side
c7015961
JH
634 )
635'
636
c5558f80
JH
637test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
638 cd "$D" &&
639 (
640 cd three &&
641 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
642 )
643'
644
645test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
646 cd "$D" &&
647 git branch -f side &&
648 (
649 cd three &&
83ecf26e
JS
650 git update-ref refs/remotes/origin/main base-origin-main &&
651 o=$(git rev-parse --verify refs/remotes/origin/main) &&
652 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
653 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c5558f80
JH
654 test "$o" = "$n" &&
655 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
83ecf26e 656 git rev-parse --verify refs/remotes/other/main
c5558f80
JH
657 )
658'
659
660test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
661 cd "$D" &&
662 git branch -f side &&
663 (
664 cd three &&
83ecf26e
JS
665 git update-ref refs/remotes/origin/main base-origin-main &&
666 o=$(git rev-parse --verify refs/remotes/origin/main) &&
667 git fetch --refmap="" origin main &&
668 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c5558f80
JH
669 test "$o" = "$n" &&
670 test_must_fail git rev-parse --verify refs/remotes/origin/side
671 )
672'
673
c7015961
JH
674test_expect_success 'configured fetch updates tracking' '
675
676 cd "$D" &&
677 git branch -f side &&
678 (
679 cd three &&
83ecf26e
JS
680 git update-ref refs/remotes/origin/main base-origin-main &&
681 o=$(git rev-parse --verify refs/remotes/origin/main) &&
c7015961 682 git fetch origin &&
83ecf26e 683 n=$(git rev-parse --verify refs/remotes/origin/main) &&
c7015961
JH
684 test "$o" != "$n" &&
685 git rev-parse --verify refs/remotes/origin/side
686 )
687'
688
823c6d56
JK
689test_expect_success 'non-matching refspecs do not confuse tracking update' '
690 cd "$D" &&
691 git update-ref refs/odd/location HEAD &&
692 (
693 cd three &&
83ecf26e 694 git update-ref refs/remotes/origin/main base-origin-main &&
823c6d56
JK
695 git config --add remote.origin.fetch \
696 refs/odd/location:refs/remotes/origin/odd &&
83ecf26e
JS
697 o=$(git rev-parse --verify refs/remotes/origin/main) &&
698 git fetch origin main &&
699 n=$(git rev-parse --verify refs/remotes/origin/main) &&
823c6d56
JK
700 test "$o" != "$n" &&
701 test_must_fail git rev-parse --verify refs/remotes/origin/odd
702 )
703'
704
9a7bbd1d
JK
705test_expect_success 'pushing nonexistent branch by mistake should not segv' '
706
707 cd "$D" &&
708 test_must_fail git push seven no:no
709
710'
711
49420252
JH
712test_expect_success 'auto tag following fetches minimum' '
713
714 cd "$D" &&
715 git clone .git follow &&
716 git checkout HEAD^0 &&
717 (
718 for i in 1 2 3 4 5 6 7
719 do
720 echo $i >>file &&
721 git commit -m $i -a &&
722 git tag -a -m $i excess-$i || exit 1
723 done
724 ) &&
83ecf26e 725 git checkout main &&
49420252
JH
726 (
727 cd follow &&
728 git fetch
729 )
730'
731
8ee5d731
JS
732test_expect_success 'refuse to fetch into the current branch' '
733
83ecf26e 734 test_must_fail git fetch . side:main
8ee5d731
JS
735
736'
737
738test_expect_success 'fetch into the current branch with --update-head-ok' '
739
83ecf26e 740 git fetch --update-head-ok . side:main
8ee5d731
JS
741
742'
743
db3c293e
JT
744test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
745 rm -f .git/FETCH_HEAD err &&
746 git fetch --dry-run . 2>err &&
747 ! test -f .git/FETCH_HEAD &&
748 grep FETCH_HEAD err
749'
750
751test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
752 rm -f .git/FETCH_HEAD err &&
753 git fetch --no-write-fetch-head . 2>err &&
754 ! test -f .git/FETCH_HEAD &&
755 ! grep FETCH_HEAD err
887952b8
JH
756'
757
758test_expect_success '--write-fetch-head gets defeated by --dry-run' '
759 rm -f .git/FETCH_HEAD &&
760 git fetch --dry-run --write-fetch-head . &&
761 ! test -f .git/FETCH_HEAD
762'
763
95c96d48 764test_expect_success "should be able to fetch with duplicate refspecs" '
aa982856
TR
765 mkdir dups &&
766 (
767 cd dups &&
768 git init &&
83ecf26e 769 git config branch.main.remote three &&
aa982856
TR
770 git config remote.three.url ../three/.git &&
771 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
772 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
773 git fetch three
774 )
95c96d48
JP
775'
776
60650a48
JH
777test_expect_success 'LHS of refspec follows ref disambiguation rules' '
778 mkdir lhs-ambiguous &&
779 (
780 cd lhs-ambiguous &&
781 git init server &&
782 test_commit -C server unwanted &&
783 test_commit -C server wanted &&
784
785 git init client &&
786
787 # Check a name coming after "refs" alphabetically ...
788 git -C server update-ref refs/heads/s wanted &&
789 git -C server update-ref refs/heads/refs/heads/s unwanted &&
790 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
791 git -C server rev-parse wanted >expect &&
792 git -C client rev-parse checkthis >actual &&
793 test_cmp expect actual &&
794
795 # ... and one before.
796 git -C server update-ref refs/heads/q wanted &&
797 git -C server update-ref refs/heads/refs/heads/q unwanted &&
798 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
799 git -C server rev-parse wanted >expect &&
800 git -C client rev-parse checkthis >actual &&
801 test_cmp expect actual &&
802
803 # Tags are preferred over branches like refs/{heads,tags}/*
804 git -C server update-ref refs/tags/t wanted &&
805 git -C server update-ref refs/heads/t unwanted &&
806 git -C client fetch ../server +t:refs/heads/checkthis &&
807 git -C server rev-parse wanted >expect &&
808 git -C client rev-parse checkthis >actual
809 )
810'
811
50f26bd0
DS
812test_expect_success 'fetch.writeCommitGraph' '
813 git clone three write &&
814 (
815 cd three &&
816 test_commit new
817 ) &&
818 (
819 cd write &&
820 git -c fetch.writeCommitGraph fetch origin &&
821 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
822 )
823'
824
cb99a34e 825test_expect_success 'fetch.writeCommitGraph with submodules' '
e88aab91
DS
826 git clone dups super &&
827 (
828 cd super &&
829 git submodule add "file://$TRASH_DIRECTORY/three" &&
830 git commit -m "add submodule"
831 ) &&
832 git clone "super" super-clone &&
833 (
834 cd super-clone &&
835 rm -rf .git/objects/info &&
836 git -c fetch.writeCommitGraph=true fetch origin &&
837 test_path_is_file .git/objects/info/commit-graphs/commit-graph-chain
838 )
839'
840
737c5a9c
MS
841# configured prune tests
842
843set_config_tristate () {
844 # var=$1 val=$2
845 case "$2" in
59caf52d
ÆAB
846 unset)
847 test_unconfig "$1"
848 ;;
849 *)
850 git config "$1" "$2"
e1790f92
ÆAB
851 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
852 git_fetch_c="$git_fetch_c -c $key=$2"
59caf52d 853 ;;
737c5a9c
MS
854 esac
855}
856
857test_configured_prune () {
e1790f92
ÆAB
858 test_configured_prune_type "$@" "name"
859 test_configured_prune_type "$@" "link"
860}
737c5a9c 861
e1790f92 862test_configured_prune_type () {
eca142d3
ÆAB
863 fetch_prune=$1
864 remote_origin_prune=$2
e249ce0c
ÆAB
865 fetch_prune_tags=$3
866 remote_origin_prune_tags=$4
867 expected_branch=$5
868 expected_tag=$6
869 cmdline=$7
870 mode=$8
e1790f92
ÆAB
871
872 if test -z "$cmdline_setup"
873 then
874 test_expect_success 'setup cmdline_setup variable for subsequent test' '
875 remote_url="file://$(git -C one config remote.origin.url)" &&
876 remote_fetch="$(git -C one config remote.origin.fetch)" &&
877 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
878 '
879 fi
880
881 if test "$mode" = 'link'
882 then
883 new_cmdline=""
884
885 if test "$cmdline" = ""
886 then
887 new_cmdline=$cmdline_setup
888 else
889 new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
890 fi
891
97716d21
ÆAB
892 if test "$fetch_prune_tags" = 'true' ||
893 test "$remote_origin_prune_tags" = 'true'
894 then
895 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
896 then
897 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
898 fi
899 fi
900
e1790f92
ÆAB
901 cmdline="$new_cmdline"
902 fi
903
e249ce0c 904 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
905 # make sure a newbranch is there in . and also in one
906 git branch -f newbranch &&
ca3065e7 907 git tag -f newtag &&
737c5a9c
MS
908 (
909 cd one &&
910 test_unconfig fetch.prune &&
e249ce0c 911 test_unconfig fetch.pruneTags &&
737c5a9c 912 test_unconfig remote.origin.prune &&
e249ce0c 913 test_unconfig remote.origin.pruneTags &&
e1790f92 914 git fetch '"$cmdline_setup"' &&
ca3065e7
ÆAB
915 git rev-parse --verify refs/remotes/origin/newbranch &&
916 git rev-parse --verify refs/tags/newtag
99094a7a 917 ) &&
737c5a9c 918
d3651121 919 # now remove them
737c5a9c 920 git branch -d newbranch &&
ca3065e7 921 git tag -d newtag &&
737c5a9c
MS
922
923 # then test
924 (
925 cd one &&
e1790f92 926 git_fetch_c="" &&
737c5a9c 927 set_config_tristate fetch.prune $fetch_prune &&
e249ce0c 928 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
737c5a9c 929 set_config_tristate remote.origin.prune $remote_origin_prune &&
e249ce0c 930 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
737c5a9c 931
e1790f92
ÆAB
932 if test "$mode" != "link"
933 then
934 git_fetch_c=""
935 fi &&
936 git$git_fetch_c fetch '"$cmdline"' &&
eca142d3 937 case "$expected_branch" in
737c5a9c
MS
938 pruned)
939 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
940 ;;
941 kept)
942 git rev-parse --verify refs/remotes/origin/newbranch
943 ;;
ca3065e7
ÆAB
944 esac &&
945 case "$expected_tag" in
946 pruned)
947 test_must_fail git rev-parse --verify refs/tags/newtag
948 ;;
949 kept)
950 git rev-parse --verify refs/tags/newtag
951 ;;
737c5a9c
MS
952 esac
953 )
954 '
955}
956
bf16ab79
ÆAB
957# $1 config: fetch.prune
958# $2 config: remote.<name>.prune
e249ce0c
ÆAB
959# $3 config: fetch.pruneTags
960# $4 config: remote.<name>.pruneTags
961# $5 expect: branch to be pruned?
962# $6 expect: tag to be pruned?
963# $7 git-fetch $cmdline:
bf16ab79 964#
e249ce0c
ÆAB
965# $1 $2 $3 $4 $5 $6 $7
966test_configured_prune unset unset unset unset kept kept ""
967test_configured_prune unset unset unset unset kept kept "--no-prune"
968test_configured_prune unset unset unset unset pruned kept "--prune"
969test_configured_prune unset unset unset unset kept pruned \
6fb23f56 970 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 971test_configured_prune unset unset unset unset pruned pruned \
6fb23f56 972 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
ca3065e7 973
e249ce0c
ÆAB
974test_configured_prune false unset unset unset kept kept ""
975test_configured_prune false unset unset unset kept kept "--no-prune"
976test_configured_prune false unset unset unset pruned kept "--prune"
ca3065e7 977
e249ce0c
ÆAB
978test_configured_prune true unset unset unset pruned kept ""
979test_configured_prune true unset unset unset pruned kept "--prune"
980test_configured_prune true unset unset unset kept kept "--no-prune"
ca3065e7 981
e249ce0c
ÆAB
982test_configured_prune unset false unset unset kept kept ""
983test_configured_prune unset false unset unset kept kept "--no-prune"
984test_configured_prune unset false unset unset pruned kept "--prune"
ca3065e7 985
e249ce0c
ÆAB
986test_configured_prune false false unset unset kept kept ""
987test_configured_prune false false unset unset kept kept "--no-prune"
988test_configured_prune false false unset unset pruned kept "--prune"
989test_configured_prune false false unset unset kept pruned \
6fb23f56 990 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 991test_configured_prune false false unset unset pruned pruned \
6fb23f56 992 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
ca3065e7 993
e249ce0c
ÆAB
994test_configured_prune true false unset unset kept kept ""
995test_configured_prune true false unset unset pruned kept "--prune"
996test_configured_prune true false unset unset kept kept "--no-prune"
ca3065e7 997
e249ce0c
ÆAB
998test_configured_prune unset true unset unset pruned kept ""
999test_configured_prune unset true unset unset kept kept "--no-prune"
1000test_configured_prune unset true unset unset pruned kept "--prune"
ca3065e7 1001
e249ce0c
ÆAB
1002test_configured_prune false true unset unset pruned kept ""
1003test_configured_prune false true unset unset kept kept "--no-prune"
1004test_configured_prune false true unset unset pruned kept "--prune"
ca3065e7 1005
e249ce0c
ÆAB
1006test_configured_prune true true unset unset pruned kept ""
1007test_configured_prune true true unset unset pruned kept "--prune"
1008test_configured_prune true true unset unset kept kept "--no-prune"
1009test_configured_prune true true unset unset kept pruned \
6fb23f56 1010 "--prune origin refs/tags/*:refs/tags/*"
e249ce0c 1011test_configured_prune true true unset unset pruned pruned \
6fb23f56 1012 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
737c5a9c 1013
97716d21 1014# --prune-tags on its own does nothing, needs --prune as well, same
6d12b533 1015# for fetch.pruneTags without fetch.prune
97716d21
ÆAB
1016test_configured_prune unset unset unset unset kept kept "--prune-tags"
1017test_configured_prune unset unset true unset kept kept ""
1018test_configured_prune unset unset unset true kept kept ""
1019
1020# These will prune the tags
1021test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
1022test_configured_prune true unset true unset pruned pruned ""
1023test_configured_prune unset true unset true pruned pruned ""
1024
1025# remote.<name>.pruneTags overrides fetch.pruneTags, just like
1026# remote.<name>.prune overrides fetch.prune if set.
1027test_configured_prune true unset true unset pruned pruned ""
1028test_configured_prune false true false true pruned pruned ""
1029test_configured_prune true false true false kept kept ""
1030
1031# When --prune-tags is supplied it's ignored if an explicit refspec is
1032# given, same for the configuration options.
1033test_configured_prune unset unset unset unset pruned kept \
1034 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
1035test_configured_prune unset unset true unset pruned kept \
1036 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1037test_configured_prune unset unset unset true pruned kept \
1038 "--prune origin +refs/heads/*:refs/remotes/origin/*"
1039
1040# Pruning that also takes place if a file:// url replaces a named
6317972c 1041# remote. However, because there's no implicit
97716d21
ÆAB
1042# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
1043# command-line negates --prune-tags, the branches will not be pruned.
1044test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
1045test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
1046test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
6317972c 1047test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
97716d21 1048test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
6317972c 1049test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
97716d21
ÆAB
1050test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
1051test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
1052test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
1053test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
1054test_configured_prune_type true unset true unset pruned pruned "origin" "name"
1055test_configured_prune_type true unset true unset kept pruned "origin" "link"
1056test_configured_prune_type unset true true unset pruned pruned "origin" "name"
1057test_configured_prune_type unset true true unset kept pruned "origin" "link"
1058test_configured_prune_type unset true unset true pruned pruned "origin" "name"
1059test_configured_prune_type unset true unset true kept pruned "origin" "link"
1060
6317972c
ÆAB
1061# When all remote.origin.fetch settings are deleted a --prune
1062# --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
1063# tags, but not tracking branches, will be deleted.
97716d21
ÆAB
1064test_expect_success 'remove remote.origin.fetch "one"' '
1065 (
1066 cd one &&
1067 git config --unset-all remote.origin.fetch
1068 )
1069'
1070test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
6317972c 1071test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
737c5a9c 1072
efe4be12
TR
1073test_expect_success 'all boundary commits are excluded' '
1074 test_commit base &&
1075 test_commit oneside &&
1076 git checkout HEAD^ &&
1077 test_commit otherside &&
83ecf26e 1078 git checkout main &&
efe4be12
TR
1079 test_tick &&
1080 git merge otherside &&
1081 ad=$(git log --no-walk --format=%ad HEAD) &&
83ecf26e 1082 git bundle create twoside-boundary.bdl main --since="$ad" &&
9901164d 1083 test_bundle_object_count --thin twoside-boundary.bdl 3
95c96d48
JP
1084'
1085
4b3b33a7
TM
1086test_expect_success 'fetch --prune prints the remotes url' '
1087 git branch goodbye &&
1088 git clone . only-prunes &&
1089 git branch -D goodbye &&
1090 (
1091 cd only-prunes &&
1092 git fetch --prune origin 2>&1 | head -n1 >../actual
1093 ) &&
1094 echo "From ${D}/." >expect &&
1108cea7 1095 test_cmp expect actual
4b3b33a7
TM
1096'
1097
10a6cc88
TM
1098test_expect_success 'branchname D/F conflict resolved by --prune' '
1099 git branch dir/file &&
1100 git clone . prune-df-conflict &&
1101 git branch -D dir/file &&
1102 git branch dir &&
1103 (
1104 cd prune-df-conflict &&
1105 git fetch --prune &&
1106 git rev-parse origin/dir >../actual
1107 ) &&
1108 git rev-parse dir >expect &&
1109 test_cmp expect actual
1110'
1111
4c224081
JK
1112test_expect_success 'fetching a one-level ref works' '
1113 test_commit extra &&
1114 git reset --hard HEAD^ &&
1115 git update-ref refs/foo extra &&
1116 git init one-level &&
1117 (
1118 cd one-level &&
1119 git fetch .. HEAD refs/foo
1120 )
1121'
1122
0898c962
JS
1123test_expect_success 'fetching with auto-gc does not lock up' '
1124 write_script askyesno <<-\EOF &&
1125 echo "$*" &&
1126 false
1127 EOF
1128 git clone "file://$D" auto-gc &&
1129 test_commit test2 &&
816c1930
MG
1130 (
1131 cd auto-gc &&
12e73a3c 1132 git config fetch.unpackLimit 1 &&
816c1930 1133 git config gc.autoPackLimit 1 &&
bb05510e 1134 git config gc.autoDetach false &&
a95ce124 1135 GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
12e73a3c 1136 test_i18ngrep "Auto packing the repository" fetch.out &&
816c1930
MG
1137 ! grep "Should I try again" fetch.out
1138 )
0898c962
JS
1139'
1140
a926c4b9 1141test_expect_success 'fetch aligned output' '
6bc91f23
NTND
1142 git clone . full-output &&
1143 test_commit looooooooooooong-tag &&
1144 (
1145 cd full-output &&
a4d4e32a
PK
1146 git -c fetch.output=full fetch origin >actual 2>&1 &&
1147 grep -e "->" actual | cut -c 22- >../actual
6bc91f23
NTND
1148 ) &&
1149 cat >expect <<-\EOF &&
66713e84 1150 main -> origin/main
6bc91f23
NTND
1151 looooooooooooong-tag -> looooooooooooong-tag
1152 EOF
1153 test_cmp expect actual
1154'
1155
a926c4b9 1156test_expect_success 'fetch compact output' '
bc437d10
NTND
1157 git clone . compact &&
1158 test_commit extraaa &&
1159 (
1160 cd compact &&
a4d4e32a
PK
1161 git -c fetch.output=compact fetch origin >actual 2>&1 &&
1162 grep -e "->" actual | cut -c 22- >../actual
bc437d10
NTND
1163 ) &&
1164 cat >expect <<-\EOF &&
66713e84 1165 main -> origin/*
bc437d10
NTND
1166 extraaa -> *
1167 EOF
1168 test_cmp expect actual
1169'
1170
12b18266
SG
1171test_expect_success '--no-show-forced-updates' '
1172 mkdir forced-updates &&
1173 (
1174 cd forced-updates &&
1175 git init &&
1176 test_commit 1 &&
1177 test_commit 2
1178 ) &&
1179 git clone forced-updates forced-update-clone &&
1180 git clone forced-updates no-forced-update-clone &&
1181 git -C forced-updates reset --hard HEAD~1 &&
1182 (
1183 cd forced-update-clone &&
1184 git fetch --show-forced-updates origin 2>output &&
1185 test_i18ngrep "(forced update)" output
1186 ) &&
1187 (
1188 cd no-forced-update-clone &&
1189 git fetch --no-show-forced-updates origin 2>output &&
1190 test_i18ngrep ! "(forced update)" output
1191 )
1192'
1193
3390e42a
JT
1194setup_negotiation_tip () {
1195 SERVER="$1"
1196 URL="$2"
1197 USE_PROTOCOL_V2="$3"
1198
1199 rm -rf "$SERVER" client trace &&
83ecf26e 1200 git init -b main "$SERVER" &&
3390e42a
JT
1201 test_commit -C "$SERVER" alpha_1 &&
1202 test_commit -C "$SERVER" alpha_2 &&
1203 git -C "$SERVER" checkout --orphan beta &&
1204 test_commit -C "$SERVER" beta_1 &&
1205 test_commit -C "$SERVER" beta_2 &&
1206
1207 git clone "$URL" client &&
1208
1209 if test "$USE_PROTOCOL_V2" -eq 1
1210 then
1211 git -C "$SERVER" config protocol.version 2 &&
1212 git -C client config protocol.version 2
1213 fi &&
1214
1215 test_commit -C "$SERVER" beta_s &&
83ecf26e 1216 git -C "$SERVER" checkout main &&
3390e42a
JT
1217 test_commit -C "$SERVER" alpha_s &&
1218 git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
1219}
1220
1221check_negotiation_tip () {
1222 # Ensure that {alpha,beta}_1 are sent as "have", but not {alpha_beta}_2
1223 ALPHA_1=$(git -C client rev-parse alpha_1) &&
1224 grep "fetch> have $ALPHA_1" trace &&
1225 BETA_1=$(git -C client rev-parse beta_1) &&
1226 grep "fetch> have $BETA_1" trace &&
1227 ALPHA_2=$(git -C client rev-parse alpha_2) &&
1228 ! grep "fetch> have $ALPHA_2" trace &&
1229 BETA_2=$(git -C client rev-parse beta_2) &&
1230 ! grep "fetch> have $BETA_2" trace
1231}
1232
1233test_expect_success '--negotiation-tip limits "have" lines sent' '
1234 setup_negotiation_tip server server 0 &&
1235 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1236 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1237 origin alpha_s beta_s &&
1238 check_negotiation_tip
1239'
1240
1241test_expect_success '--negotiation-tip understands globs' '
1242 setup_negotiation_tip server server 0 &&
1243 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1244 --negotiation-tip=*_1 \
1245 origin alpha_s beta_s &&
1246 check_negotiation_tip
1247'
1248
1249test_expect_success '--negotiation-tip understands abbreviated SHA-1' '
1250 setup_negotiation_tip server server 0 &&
1251 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1252 --negotiation-tip=$(git -C client rev-parse --short alpha_1) \
1253 --negotiation-tip=$(git -C client rev-parse --short beta_1) \
1254 origin alpha_s beta_s &&
1255 check_negotiation_tip
1256'
1257
82823118
JT
1258test_expect_success '--negotiation-tip rejects missing OIDs' '
1259 setup_negotiation_tip server server 0 &&
1260 test_must_fail git -C client fetch \
1261 --negotiation-tip=alpha_1 \
1262 --negotiation-tip=$(test_oid zero) \
1263 origin alpha_s beta_s 2>err &&
1264 cat >fatal-expect <<-EOF &&
1265 fatal: the object $(test_oid zero) does not exist
1266EOF
1267 grep fatal: err >fatal-actual &&
1268 test_cmp fatal-expect fatal-actual
1269'
1270
3390e42a
JT
1271. "$TEST_DIRECTORY"/lib-httpd.sh
1272start_httpd
1273
1274test_expect_success '--negotiation-tip limits "have" lines sent with HTTP protocol v2' '
1275 setup_negotiation_tip "$HTTPD_DOCUMENT_ROOT_PATH/server" \
1276 "$HTTPD_URL/smart/server" 1 &&
1277 GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
1278 --negotiation-tip=alpha_1 --negotiation-tip=beta_1 \
1279 origin alpha_s beta_s &&
1280 check_negotiation_tip
1281'
1282
12b18266
SG
1283# DO NOT add non-httpd-specific tests here, because the last part of this
1284# test script is only executed when httpd is available and enabled.
cdbd70c4 1285
7be1d62c 1286test_done