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