blob: 858381a7881f430c5e779c2e385ebda4bed3a6dc [file] [log] [blame]
Junio C Hamano7be1d622006-09-23 03:40:17 -07001#!/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
9
Elia Pintoa9d32be2015-12-23 14:45:55 +010010D=$(pwd)
Junio C Hamano7be1d622006-09-23 03:40:17 -070011
Junio C Hamano2e674a92009-08-07 20:12:13 -070012test_bundle_object_count () {
13 git verify-pack -v "$1" >verify.out &&
14 test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
15}
16
Thomas Rast61821aa2012-03-01 22:40:48 +010017convert_bundle_to_pack () {
18 while read x && test -n "$x"
19 do
20 :;
21 done
22 cat
23}
24
Junio C Hamano7be1d622006-09-23 03:40:17 -070025test_expect_success setup '
26 echo >file original &&
27 git add file &&
28 git commit -a -m original'
29
30test_expect_success "clone and setup child repos" '
31 git clone . one &&
Jonathan Nieder18a82692010-09-06 20:42:54 -050032 (
33 cd one &&
34 echo >file updated by one &&
35 git commit -a -m "updated by one"
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020036 ) &&
Junio C Hamano7be1d622006-09-23 03:40:17 -070037 git clone . two &&
Jonathan Nieder18a82692010-09-06 20:42:54 -050038 (
39 cd two &&
40 git config branch.master.remote one &&
41 git config remote.one.url ../one/.git/ &&
42 git config remote.one.fetch refs/heads/master:refs/heads/one
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020043 ) &&
Santi Béjar6cc7c362006-09-23 22:55:35 +020044 git clone . three &&
Jonathan Nieder18a82692010-09-06 20:42:54 -050045 (
46 cd three &&
47 git config branch.master.remote two &&
48 git config branch.master.merge refs/heads/one &&
49 mkdir -p .git/remotes &&
50 {
51 echo "URL: ../two/.git/"
52 echo "Pull: refs/heads/master:refs/heads/two"
53 echo "Pull: refs/heads/one:refs/heads/one"
54 } >.git/remotes/two
Jens Lehmannfd4ec4f2010-09-06 20:39:54 +020055 ) &&
Jeff King9a7bbd12008-06-16 12:15:02 -040056 git clone . bundle &&
57 git clone . seven
Junio C Hamano7be1d622006-09-23 03:40:17 -070058'
59
60test_expect_success "fetch test" '
61 cd "$D" &&
62 echo >file updated by origin &&
63 git commit -a -m "updated by origin" &&
64 cd two &&
65 git fetch &&
66 test -f .git/refs/heads/one &&
Elia Pintoa9d32be2015-12-23 14:45:55 +010067 mine=$(git rev-parse refs/heads/one) &&
68 his=$(cd ../one && git rev-parse refs/heads/master) &&
Junio C Hamano7be1d622006-09-23 03:40:17 -070069 test "z$mine" = "z$his"
70'
71
Santi Béjar6cc7c362006-09-23 22:55:35 +020072test_expect_success "fetch test for-merge" '
73 cd "$D" &&
74 cd three &&
75 git fetch &&
76 test -f .git/refs/heads/two &&
77 test -f .git/refs/heads/one &&
Elia Pintoa9d32be2015-12-23 14:45:55 +010078 master_in_two=$(cd ../two && git rev-parse master) &&
79 one_in_two=$(cd ../two && git rev-parse one) &&
Santi Béjar6cc7c362006-09-23 22:55:35 +020080 {
Santi Béjar6cc7c362006-09-23 22:55:35 +020081 echo "$one_in_two "
Joey Hess96890f42011-12-26 12:16:56 -040082 echo "$master_in_two not-for-merge"
Santi Béjar6cc7c362006-09-23 22:55:35 +020083 } >expected &&
84 cut -f -2 .git/FETCH_HEAD >actual &&
Gary V. Vaughan4fdf71b2010-05-14 09:31:37 +000085 test_cmp expected actual'
Santi Béjar6cc7c362006-09-23 22:55:35 +020086
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +020087test_expect_success 'fetch --prune on its own works as expected' '
88 cd "$D" &&
89 git clone . prune &&
90 cd prune &&
Michael Haggertyd0d06e82013-10-23 17:50:35 +020091 git update-ref refs/remotes/origin/extrabranch master &&
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +020092
93 git fetch --prune origin &&
94 test_must_fail git rev-parse origin/extrabranch
95'
96
Carlos Martín Nietoed43de62011-10-15 07:04:25 +020097test_expect_success 'fetch --prune with a branch name keeps branches' '
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +020098 cd "$D" &&
99 git clone . prune-branch &&
100 cd prune-branch &&
Michael Haggertyd0d06e82013-10-23 17:50:35 +0200101 git update-ref refs/remotes/origin/extrabranch master &&
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200102
103 git fetch --prune origin master &&
104 git rev-parse origin/extrabranch
105'
106
Carlos Martín Nietoed43de62011-10-15 07:04:25 +0200107test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200108 cd "$D" &&
109 git clone . prune-namespace &&
110 cd prune-namespace &&
111
112 git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
113 git rev-parse origin/master
114'
115
Carlos Martín Nietoe6f63712014-02-27 10:00:10 +0100116test_expect_success 'fetch --prune handles overlapping refspecs' '
Carlos Martín Nietof377e7a2014-02-27 10:00:09 +0100117 cd "$D" &&
118 git update-ref refs/pull/42/head master &&
119 git clone . prune-overlapping &&
120 cd prune-overlapping &&
121 git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
122
123 git fetch --prune origin &&
124 git rev-parse origin/master &&
125 git rev-parse origin/pr/42 &&
126
Jeff King8fb26872015-03-20 06:06:15 -0400127 git config --unset-all remote.origin.fetch &&
Carlos Martín Nietof377e7a2014-02-27 10:00:09 +0100128 git config remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
129 git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
130
131 git fetch --prune origin &&
132 git rev-parse origin/master &&
133 git rev-parse origin/pr/42
134'
135
Michael Haggerty0838bf42013-10-30 06:33:00 +0100136test_expect_success 'fetch --prune --tags prunes branches but not tags' '
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200137 cd "$D" &&
138 git clone . prune-tags &&
139 cd prune-tags &&
Michael Haggertyd0d06e82013-10-23 17:50:35 +0200140 git tag sometag master &&
Michael Haggerty68a304d2013-10-23 17:50:36 +0200141 # Create what looks like a remote-tracking branch from an earlier
142 # fetch that has since been deleted from the remote:
143 git update-ref refs/remotes/origin/fake-remote master &&
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200144
145 git fetch --prune --tags origin &&
146 git rev-parse origin/master &&
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100147 test_must_fail git rev-parse origin/fake-remote &&
Michael Haggerty0838bf42013-10-30 06:33:00 +0100148 git rev-parse sometag
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200149'
150
Michael Haggerty0838bf42013-10-30 06:33:00 +0100151test_expect_success 'fetch --prune --tags with branch does not prune other things' '
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200152 cd "$D" &&
153 git clone . prune-tags-branch &&
154 cd prune-tags-branch &&
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100155 git tag sometag master &&
Michael Haggertyd0d06e82013-10-23 17:50:35 +0200156 git update-ref refs/remotes/origin/extrabranch master &&
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200157
158 git fetch --prune --tags origin master &&
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100159 git rev-parse origin/extrabranch &&
Michael Haggerty0838bf42013-10-30 06:33:00 +0100160 git rev-parse sometag
Michael Haggertyc5a84e92013-10-30 06:32:59 +0100161'
162
163test_expect_success 'fetch --prune --tags with refspec prunes based on refspec' '
164 cd "$D" &&
165 git clone . prune-tags-refspec &&
166 cd prune-tags-refspec &&
167 git tag sometag master &&
168 git update-ref refs/remotes/origin/foo/otherbranch master &&
169 git update-ref refs/remotes/origin/extrabranch master &&
170
171 git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
172 test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
173 git rev-parse origin/extrabranch &&
Michael Haggerty0838bf42013-10-30 06:33:00 +0100174 git rev-parse sometag
Carlos Martín Nieto43a8a042011-10-08 00:51:07 +0200175'
176
Väinö Järveläf539d0d2007-10-09 11:51:07 +0300177test_expect_success 'fetch tags when there is no tags' '
178
179 cd "$D" &&
180
181 mkdir notags &&
182 cd notags &&
183 git init &&
184
185 git fetch -t ..
186
187'
188
Junio C Hamano6c96c0f2006-11-18 21:39:17 -0800189test_expect_success 'fetch following tags' '
190
191 cd "$D" &&
192 git tag -a -m 'annotated' anno HEAD &&
193 git tag light HEAD &&
194
195 mkdir four &&
196 cd four &&
Nicolas Pitre5c94f872007-01-12 16:01:46 -0500197 git init &&
Junio C Hamano6c96c0f2006-11-18 21:39:17 -0800198
199 git fetch .. :track &&
200 git show-ref --verify refs/tags/anno &&
201 git show-ref --verify refs/tags/light
202
203'
204
Marc Branchaud0997ada2012-04-16 18:08:50 -0400205test_expect_success 'fetch uses remote ref names to describe new refs' '
206 cd "$D" &&
207 git init descriptive &&
208 (
209 cd descriptive &&
210 git config remote.o.url .. &&
211 git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
212 git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
213 git fetch o
214 ) &&
215 git tag -a -m "Descriptive tag" descriptive-tag &&
216 git branch descriptive-branch &&
217 git checkout descriptive-branch &&
218 echo "Nuts" >crazy &&
219 git add crazy &&
220 git commit -a -m "descriptive commit" &&
221 git update-ref refs/others/crazy HEAD &&
222 (
223 cd descriptive &&
224 git fetch o 2>actual &&
SZEDER Gábor927c1a62018-02-08 16:56:52 +0100225 test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
226 test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
227 test_i18ngrep "new ref.* -> crazy$" actual
Marc Branchaud0997ada2012-04-16 18:08:50 -0400228 ) &&
229 git checkout master
230'
231
Junio C Hamano41ac4142008-02-01 01:50:53 -0800232test_expect_success 'fetch must not resolve short tag name' '
Steffen Prohaska605b4972007-11-11 15:01:48 +0100233
234 cd "$D" &&
235
236 mkdir five &&
237 cd five &&
238 git init &&
239
Stephan Beyerd492b312008-07-12 17:47:52 +0200240 test_must_fail git fetch .. anno:five
Steffen Prohaska605b4972007-11-11 15:01:48 +0100241
242'
243
Junio C Hamanodd621df2011-11-04 14:14:05 -0700244test_expect_success 'fetch can now resolve short remote name' '
Steffen Prohaska605b4972007-11-11 15:01:48 +0100245
246 cd "$D" &&
Jonathan Niedera48fcd82010-10-30 20:46:54 -0500247 git update-ref refs/remotes/six/HEAD HEAD &&
Steffen Prohaska605b4972007-11-11 15:01:48 +0100248
249 mkdir six &&
250 cd six &&
251 git init &&
252
Junio C Hamanodd621df2011-11-04 14:14:05 -0700253 git fetch .. six:six
Steffen Prohaska605b4972007-11-11 15:01:48 +0100254'
255
Johannes Schindelin2e0afaf2007-02-22 01:59:14 +0100256test_expect_success 'create bundle 1' '
257 cd "$D" &&
258 echo >file updated again by origin &&
259 git commit -a -m "tip" &&
260 git bundle create bundle1 master^..master
261'
262
Johannes Schindelin83155882007-03-06 22:57:07 +0100263test_expect_success 'header of bundle looks right' '
264 head -n 1 "$D"/bundle1 | grep "^#" &&
265 head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
266 head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
267 head -n 4 "$D"/bundle1 | grep "^$"
268'
269
Johannes Schindelin2e0afaf2007-02-22 01:59:14 +0100270test_expect_success 'create bundle 2' '
271 cd "$D" &&
272 git bundle create bundle2 master~2..master
273'
274
Junio C Hamano41ac4142008-02-01 01:50:53 -0800275test_expect_success 'unbundle 1' '
Johannes Schindelin2e0afaf2007-02-22 01:59:14 +0100276 cd "$D/bundle" &&
277 git checkout -b some-branch &&
Stephan Beyerd492b312008-07-12 17:47:52 +0200278 test_must_fail git fetch "$D/bundle1" master:master
Johannes Schindelin2e0afaf2007-02-22 01:59:14 +0100279'
280
Junio C Hamano2e674a92009-08-07 20:12:13 -0700281
Johannes Schindelin83155882007-03-06 22:57:07 +0100282test_expect_success 'bundle 1 has only 3 files ' '
283 cd "$D" &&
Thomas Rast61821aa2012-03-01 22:40:48 +0100284 convert_bundle_to_pack <bundle1 >bundle.pack &&
Johannes Schindelin83155882007-03-06 22:57:07 +0100285 git index-pack bundle.pack &&
Junio C Hamano2e674a92009-08-07 20:12:13 -0700286 test_bundle_object_count bundle.pack 3
Johannes Schindelin83155882007-03-06 22:57:07 +0100287'
288
Johannes Schindelin2e0afaf2007-02-22 01:59:14 +0100289test_expect_success 'unbundle 2' '
290 cd "$D/bundle" &&
291 git fetch ../bundle2 master:master &&
292 test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
293'
294
Johannes Schindelin18449ab2007-03-08 00:43:05 +0100295test_expect_success 'bundle does not prerequisite objects' '
296 cd "$D" &&
297 touch file2 &&
298 git add file2 &&
299 git commit -m add.file2 file2 &&
300 git bundle create bundle3 -1 HEAD &&
Thomas Rast61821aa2012-03-01 22:40:48 +0100301 convert_bundle_to_pack <bundle3 >bundle.pack &&
Johannes Schindelin18449ab2007-03-08 00:43:05 +0100302 git index-pack bundle.pack &&
Junio C Hamano2e674a92009-08-07 20:12:13 -0700303 test_bundle_object_count bundle.pack 3
Johannes Schindelin18449ab2007-03-08 00:43:05 +0100304'
305
Junio C Hamano7fa82542007-08-08 17:01:49 -0700306test_expect_success 'bundle should be able to create a full history' '
307
308 cd "$D" &&
309 git tag -a -m '1.0' v1.0 master &&
310 git bundle create bundle4 v1.0
311
312'
313
Johannes Schindelinda0204d2007-10-11 01:47:55 +0100314test_expect_success 'fetch with a non-applying branch.<name>.merge' '
315 git config branch.master.remote yeti &&
316 git config branch.master.merge refs/heads/bigfoot &&
317 git config remote.blub.url one &&
318 git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
319 git fetch blub
320'
321
Brandon Casey042cca32010-09-09 13:56:37 -0500322# URL supplied to fetch does not match the url of the configured branch's remote
323test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
324 one_head=$(cd one && git rev-parse HEAD) &&
325 this_head=$(git rev-parse HEAD) &&
Brandon Casey6106ce42010-08-25 12:52:55 -0500326 git update-ref -d FETCH_HEAD &&
327 git fetch one &&
Brandon Casey042cca32010-09-09 13:56:37 -0500328 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
329 test $this_head = "$(git rev-parse --verify HEAD)"
330'
331
332# URL supplied to fetch matches the url of the configured branch's remote and
333# the merge spec matches the branch the remote HEAD points to
334test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
335 one_ref=$(cd one && git symbolic-ref HEAD) &&
336 git config branch.master.remote blub &&
337 git config branch.master.merge "$one_ref" &&
338 git update-ref -d FETCH_HEAD &&
339 git fetch one &&
340 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
341 test $this_head = "$(git rev-parse --verify HEAD)"
342'
343
344# URL supplied to fetch matches the url of the configured branch's remote, but
345# the merge spec does not match the branch the remote HEAD points to
346test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
347 git config branch.master.merge "${one_ref}_not" &&
348 git update-ref -d FETCH_HEAD &&
349 git fetch one &&
350 test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
351 test $this_head = "$(git rev-parse --verify HEAD)"
Brandon Casey6106ce42010-08-25 12:52:55 -0500352'
353
Johannes Sixtc2015b32007-11-04 21:26:22 +0100354# the strange name is: a\!'b
355test_expect_success 'quoting of a strangely named repo' '
Stephan Beyerd492b312008-07-12 17:47:52 +0200356 test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
Johannes Sixtc2015b32007-11-04 21:26:22 +0100357 cat result &&
358 grep "fatal: '\''a\\\\!'\''b'\''" result
359'
360
Johannes Schindelinc5546e82007-11-22 12:24:59 +0000361test_expect_success 'bundle should record HEAD correctly' '
362
363 cd "$D" &&
364 git bundle create bundle5 HEAD master &&
365 git bundle list-heads bundle5 >actual &&
366 for h in HEAD refs/heads/master
367 do
368 echo "$(git rev-parse --verify $h) $h"
369 done >expect &&
Jeff King82ebb0b2008-03-12 17:36:36 -0400370 test_cmp expect actual
Johannes Schindelinc5546e82007-11-22 12:24:59 +0000371
372'
373
Jeff King51f8c812013-05-11 18:14:03 +0200374test_expect_success 'mark initial state of origin/master' '
375 (
376 cd three &&
377 git tag base-origin-master refs/remotes/origin/master
378 )
379'
380
Jeff Kingf2690482013-05-11 18:16:52 +0200381test_expect_success 'explicit fetch should update tracking' '
Junio C Hamanoc7015962007-12-04 21:58:42 -0800382
383 cd "$D" &&
384 git branch -f side &&
385 (
386 cd three &&
Jeff King51f8c812013-05-11 18:14:03 +0200387 git update-ref refs/remotes/origin/master base-origin-master &&
Junio C Hamanoc7015962007-12-04 21:58:42 -0800388 o=$(git rev-parse --verify refs/remotes/origin/master) &&
389 git fetch origin master &&
390 n=$(git rev-parse --verify refs/remotes/origin/master) &&
Jeff Kingf2690482013-05-11 18:16:52 +0200391 test "$o" != "$n" &&
Stephan Beyerd492b312008-07-12 17:47:52 +0200392 test_must_fail git rev-parse --verify refs/remotes/origin/side
Junio C Hamanoc7015962007-12-04 21:58:42 -0800393 )
394'
395
Jeff Kingf2690482013-05-11 18:16:52 +0200396test_expect_success 'explicit pull should update tracking' '
Junio C Hamanoc7015962007-12-04 21:58:42 -0800397
398 cd "$D" &&
399 git branch -f side &&
400 (
401 cd three &&
Jeff King51f8c812013-05-11 18:14:03 +0200402 git update-ref refs/remotes/origin/master base-origin-master &&
Junio C Hamanoc7015962007-12-04 21:58:42 -0800403 o=$(git rev-parse --verify refs/remotes/origin/master) &&
404 git pull origin master &&
405 n=$(git rev-parse --verify refs/remotes/origin/master) &&
Jeff Kingf2690482013-05-11 18:16:52 +0200406 test "$o" != "$n" &&
Stephan Beyerd492b312008-07-12 17:47:52 +0200407 test_must_fail git rev-parse --verify refs/remotes/origin/side
Junio C Hamanoc7015962007-12-04 21:58:42 -0800408 )
409'
410
Junio C Hamanoc5558f82014-05-29 15:21:31 -0700411test_expect_success 'explicit --refmap is allowed only with command-line refspec' '
412 cd "$D" &&
413 (
414 cd three &&
415 test_must_fail git fetch --refmap="*:refs/remotes/none/*"
416 )
417'
418
419test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
420 cd "$D" &&
421 git branch -f side &&
422 (
423 cd three &&
424 git update-ref refs/remotes/origin/master base-origin-master &&
425 o=$(git rev-parse --verify refs/remotes/origin/master) &&
426 git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
427 n=$(git rev-parse --verify refs/remotes/origin/master) &&
428 test "$o" = "$n" &&
429 test_must_fail git rev-parse --verify refs/remotes/origin/side &&
430 git rev-parse --verify refs/remotes/other/master
431 )
432'
433
434test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
435 cd "$D" &&
436 git branch -f side &&
437 (
438 cd three &&
439 git update-ref refs/remotes/origin/master base-origin-master &&
440 o=$(git rev-parse --verify refs/remotes/origin/master) &&
441 git fetch --refmap="" origin master &&
442 n=$(git rev-parse --verify refs/remotes/origin/master) &&
443 test "$o" = "$n" &&
444 test_must_fail git rev-parse --verify refs/remotes/origin/side
445 )
446'
447
Junio C Hamanoc7015962007-12-04 21:58:42 -0800448test_expect_success 'configured fetch updates tracking' '
449
450 cd "$D" &&
451 git branch -f side &&
452 (
453 cd three &&
Jeff King51f8c812013-05-11 18:14:03 +0200454 git update-ref refs/remotes/origin/master base-origin-master &&
Junio C Hamanoc7015962007-12-04 21:58:42 -0800455 o=$(git rev-parse --verify refs/remotes/origin/master) &&
456 git fetch origin &&
457 n=$(git rev-parse --verify refs/remotes/origin/master) &&
458 test "$o" != "$n" &&
459 git rev-parse --verify refs/remotes/origin/side
460 )
461'
462
John Keeping823c6d52013-05-27 17:33:09 +0100463test_expect_success 'non-matching refspecs do not confuse tracking update' '
464 cd "$D" &&
465 git update-ref refs/odd/location HEAD &&
466 (
467 cd three &&
468 git update-ref refs/remotes/origin/master base-origin-master &&
469 git config --add remote.origin.fetch \
470 refs/odd/location:refs/remotes/origin/odd &&
471 o=$(git rev-parse --verify refs/remotes/origin/master) &&
472 git fetch origin master &&
473 n=$(git rev-parse --verify refs/remotes/origin/master) &&
474 test "$o" != "$n" &&
475 test_must_fail git rev-parse --verify refs/remotes/origin/odd
476 )
477'
478
Jeff King9a7bbd12008-06-16 12:15:02 -0400479test_expect_success 'pushing nonexistent branch by mistake should not segv' '
480
481 cd "$D" &&
482 test_must_fail git push seven no:no
483
484'
485
Junio C Hamano49420252008-09-21 23:50:01 -0700486test_expect_success 'auto tag following fetches minimum' '
487
488 cd "$D" &&
489 git clone .git follow &&
490 git checkout HEAD^0 &&
491 (
492 for i in 1 2 3 4 5 6 7
493 do
494 echo $i >>file &&
495 git commit -m $i -a &&
496 git tag -a -m $i excess-$i || exit 1
497 done
498 ) &&
499 git checkout master &&
500 (
501 cd follow &&
502 git fetch
503 )
504'
505
Johannes Schindelin8ee5d732008-10-13 11:36:52 +0200506test_expect_success 'refuse to fetch into the current branch' '
507
508 test_must_fail git fetch . side:master
509
510'
511
512test_expect_success 'fetch into the current branch with --update-head-ok' '
513
514 git fetch --update-head-ok . side:master
515
516'
517
Johannes Sixt3fdcdbd2010-02-25 21:03:44 +0100518test_expect_success 'fetch --dry-run' '
519
520 rm -f .git/FETCH_HEAD &&
521 git fetch --dry-run . &&
522 ! test -f .git/FETCH_HEAD
523'
524
Julian Phillips95c96d42009-11-13 21:25:56 +0000525test_expect_success "should be able to fetch with duplicate refspecs" '
Thomas Rastaa982852012-03-01 22:40:49 +0100526 mkdir dups &&
527 (
528 cd dups &&
529 git init &&
530 git config branch.master.remote three &&
531 git config remote.three.url ../three/.git &&
532 git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
533 git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
534 git fetch three
535 )
Julian Phillips95c96d42009-11-13 21:25:56 +0000536'
537
Junio C Hamano60650a42018-08-01 09:22:37 -0700538test_expect_success 'LHS of refspec follows ref disambiguation rules' '
539 mkdir lhs-ambiguous &&
540 (
541 cd lhs-ambiguous &&
542 git init server &&
543 test_commit -C server unwanted &&
544 test_commit -C server wanted &&
545
546 git init client &&
547
548 # Check a name coming after "refs" alphabetically ...
549 git -C server update-ref refs/heads/s wanted &&
550 git -C server update-ref refs/heads/refs/heads/s unwanted &&
551 git -C client fetch ../server +refs/heads/s:refs/heads/checkthis &&
552 git -C server rev-parse wanted >expect &&
553 git -C client rev-parse checkthis >actual &&
554 test_cmp expect actual &&
555
556 # ... and one before.
557 git -C server update-ref refs/heads/q wanted &&
558 git -C server update-ref refs/heads/refs/heads/q unwanted &&
559 git -C client fetch ../server +refs/heads/q:refs/heads/checkthis &&
560 git -C server rev-parse wanted >expect &&
561 git -C client rev-parse checkthis >actual &&
562 test_cmp expect actual &&
563
564 # Tags are preferred over branches like refs/{heads,tags}/*
565 git -C server update-ref refs/tags/t wanted &&
566 git -C server update-ref refs/heads/t unwanted &&
567 git -C client fetch ../server +t:refs/heads/checkthis &&
568 git -C server rev-parse wanted >expect &&
569 git -C client rev-parse checkthis >actual
570 )
571'
572
Michael Schubert737c5a92013-07-13 11:36:24 +0200573# configured prune tests
574
575set_config_tristate () {
576 # var=$1 val=$2
577 case "$2" in
Ævar Arnfjörð Bjarmason59caf522018-02-09 20:32:09 +0000578 unset)
579 test_unconfig "$1"
580 ;;
581 *)
582 git config "$1" "$2"
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000583 key=$(echo $1 | sed -e 's/^remote\.origin/fetch/')
584 git_fetch_c="$git_fetch_c -c $key=$2"
Ævar Arnfjörð Bjarmason59caf522018-02-09 20:32:09 +0000585 ;;
Michael Schubert737c5a92013-07-13 11:36:24 +0200586 esac
587}
588
589test_configured_prune () {
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000590 test_configured_prune_type "$@" "name"
591 test_configured_prune_type "$@" "link"
592}
Michael Schubert737c5a92013-07-13 11:36:24 +0200593
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000594test_configured_prune_type () {
Ævar Arnfjörð Bjarmasoneca142d2018-02-09 20:32:04 +0000595 fetch_prune=$1
596 remote_origin_prune=$2
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000597 fetch_prune_tags=$3
598 remote_origin_prune_tags=$4
599 expected_branch=$5
600 expected_tag=$6
601 cmdline=$7
602 mode=$8
Michael Schubert737c5a92013-07-13 11:36:24 +0200603
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000604 if test -z "$cmdline_setup"
605 then
606 test_expect_success 'setup cmdline_setup variable for subsequent test' '
607 remote_url="file://$(git -C one config remote.origin.url)" &&
608 remote_fetch="$(git -C one config remote.origin.fetch)" &&
609 cmdline_setup="\"$remote_url\" \"$remote_fetch\""
610 '
611 fi
612
613 if test "$mode" = 'link'
614 then
615 new_cmdline=""
616
617 if test "$cmdline" = ""
618 then
619 new_cmdline=$cmdline_setup
620 else
621 new_cmdline=$(printf "%s" "$cmdline" | perl -pe 's[origin(?!/)]["'"$remote_url"'"]g')
622 fi
623
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000624 if test "$fetch_prune_tags" = 'true' ||
625 test "$remote_origin_prune_tags" = 'true'
626 then
627 if ! printf '%s' "$cmdline\n" | grep -q refs/remotes/origin/
628 then
629 new_cmdline="$new_cmdline refs/tags/*:refs/tags/*"
630 fi
631 fi
632
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000633 cmdline="$new_cmdline"
634 fi
635
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000636 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" '
Michael Schubert737c5a92013-07-13 11:36:24 +0200637 # make sure a newbranch is there in . and also in one
638 git branch -f newbranch &&
Ævar Arnfjörð Bjarmasonca3065e2018-02-09 20:32:06 +0000639 git tag -f newtag &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200640 (
641 cd one &&
642 test_unconfig fetch.prune &&
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000643 test_unconfig fetch.pruneTags &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200644 test_unconfig remote.origin.prune &&
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000645 test_unconfig remote.origin.pruneTags &&
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000646 git fetch '"$cmdline_setup"' &&
Ævar Arnfjörð Bjarmasonca3065e2018-02-09 20:32:06 +0000647 git rev-parse --verify refs/remotes/origin/newbranch &&
648 git rev-parse --verify refs/tags/newtag
Jeff King99094a72015-03-20 06:07:15 -0400649 ) &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200650
651 # now remove it
652 git branch -d newbranch &&
Ævar Arnfjörð Bjarmasonca3065e2018-02-09 20:32:06 +0000653 git tag -d newtag &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200654
655 # then test
656 (
657 cd one &&
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000658 git_fetch_c="" &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200659 set_config_tristate fetch.prune $fetch_prune &&
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000660 set_config_tristate fetch.pruneTags $fetch_prune_tags &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200661 set_config_tristate remote.origin.prune $remote_origin_prune &&
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000662 set_config_tristate remote.origin.pruneTags $remote_origin_prune_tags &&
Michael Schubert737c5a92013-07-13 11:36:24 +0200663
Ævar Arnfjörð Bjarmasone1790f92018-02-09 20:32:10 +0000664 if test "$mode" != "link"
665 then
666 git_fetch_c=""
667 fi &&
668 git$git_fetch_c fetch '"$cmdline"' &&
Ævar Arnfjörð Bjarmasoneca142d2018-02-09 20:32:04 +0000669 case "$expected_branch" in
Michael Schubert737c5a92013-07-13 11:36:24 +0200670 pruned)
671 test_must_fail git rev-parse --verify refs/remotes/origin/newbranch
672 ;;
673 kept)
674 git rev-parse --verify refs/remotes/origin/newbranch
675 ;;
Ævar Arnfjörð Bjarmasonca3065e2018-02-09 20:32:06 +0000676 esac &&
677 case "$expected_tag" in
678 pruned)
679 test_must_fail git rev-parse --verify refs/tags/newtag
680 ;;
681 kept)
682 git rev-parse --verify refs/tags/newtag
683 ;;
Michael Schubert737c5a92013-07-13 11:36:24 +0200684 esac
685 )
686 '
687}
688
Ævar Arnfjörð Bjarmasonbf16ab72018-02-09 20:32:05 +0000689# $1 config: fetch.prune
690# $2 config: remote.<name>.prune
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000691# $3 config: fetch.pruneTags
692# $4 config: remote.<name>.pruneTags
693# $5 expect: branch to be pruned?
694# $6 expect: tag to be pruned?
695# $7 git-fetch $cmdline:
Ævar Arnfjörð Bjarmasonbf16ab72018-02-09 20:32:05 +0000696#
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000697# $1 $2 $3 $4 $5 $6 $7
698test_configured_prune unset unset unset unset kept kept ""
699test_configured_prune unset unset unset unset kept kept "--no-prune"
700test_configured_prune unset unset unset unset pruned kept "--prune"
701test_configured_prune unset unset unset unset kept pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000702 "--prune origin refs/tags/*:refs/tags/*"
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000703test_configured_prune unset unset unset unset pruned pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000704 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
Michael Schubert737c5a92013-07-13 11:36:24 +0200705
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000706test_configured_prune false unset unset unset kept kept ""
707test_configured_prune false unset unset unset kept kept "--no-prune"
708test_configured_prune false unset unset unset pruned kept "--prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200709
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000710test_configured_prune true unset unset unset pruned kept ""
711test_configured_prune true unset unset unset pruned kept "--prune"
712test_configured_prune true unset unset unset kept kept "--no-prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200713
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000714test_configured_prune unset false unset unset kept kept ""
715test_configured_prune unset false unset unset kept kept "--no-prune"
716test_configured_prune unset false unset unset pruned kept "--prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200717
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000718test_configured_prune false false unset unset kept kept ""
719test_configured_prune false false unset unset kept kept "--no-prune"
720test_configured_prune false false unset unset pruned kept "--prune"
721test_configured_prune false false unset unset kept pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000722 "--prune origin refs/tags/*:refs/tags/*"
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000723test_configured_prune false false unset unset pruned pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000724 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
Michael Schubert737c5a92013-07-13 11:36:24 +0200725
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000726test_configured_prune true false unset unset kept kept ""
727test_configured_prune true false unset unset pruned kept "--prune"
728test_configured_prune true false unset unset kept kept "--no-prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200729
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000730test_configured_prune unset true unset unset pruned kept ""
731test_configured_prune unset true unset unset kept kept "--no-prune"
732test_configured_prune unset true unset unset pruned kept "--prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200733
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000734test_configured_prune false true unset unset pruned kept ""
735test_configured_prune false true unset unset kept kept "--no-prune"
736test_configured_prune false true unset unset pruned kept "--prune"
Michael Schubert737c5a92013-07-13 11:36:24 +0200737
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000738test_configured_prune true true unset unset pruned kept ""
739test_configured_prune true true unset unset pruned kept "--prune"
740test_configured_prune true true unset unset kept kept "--no-prune"
741test_configured_prune true true unset unset kept pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000742 "--prune origin refs/tags/*:refs/tags/*"
Ævar Arnfjörð Bjarmasone249ce02018-02-09 20:32:14 +0000743test_configured_prune true true unset unset pruned pruned \
Ævar Arnfjörð Bjarmason6fb23f52018-02-09 20:32:07 +0000744 "--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
Michael Schubert737c5a92013-07-13 11:36:24 +0200745
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000746# --prune-tags on its own does nothing, needs --prune as well, same
747# for for fetch.pruneTags without fetch.prune
748test_configured_prune unset unset unset unset kept kept "--prune-tags"
749test_configured_prune unset unset true unset kept kept ""
750test_configured_prune unset unset unset true kept kept ""
751
752# These will prune the tags
753test_configured_prune unset unset unset unset pruned pruned "--prune --prune-tags"
754test_configured_prune true unset true unset pruned pruned ""
755test_configured_prune unset true unset true pruned pruned ""
756
757# remote.<name>.pruneTags overrides fetch.pruneTags, just like
758# remote.<name>.prune overrides fetch.prune if set.
759test_configured_prune true unset true unset pruned pruned ""
760test_configured_prune false true false true pruned pruned ""
761test_configured_prune true false true false kept kept ""
762
763# When --prune-tags is supplied it's ignored if an explicit refspec is
764# given, same for the configuration options.
765test_configured_prune unset unset unset unset pruned kept \
766 "--prune --prune-tags origin +refs/heads/*:refs/remotes/origin/*"
767test_configured_prune unset unset true unset pruned kept \
768 "--prune origin +refs/heads/*:refs/remotes/origin/*"
769test_configured_prune unset unset unset true pruned kept \
770 "--prune origin +refs/heads/*:refs/remotes/origin/*"
771
772# Pruning that also takes place if a file:// url replaces a named
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +0000773# remote. However, because there's no implicit
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000774# +refs/heads/*:refs/remotes/origin/* refspec and supplying it on the
775# command-line negates --prune-tags, the branches will not be pruned.
776test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "name"
777test_configured_prune_type unset unset unset unset kept kept "origin --prune-tags" "link"
778test_configured_prune_type unset unset unset unset pruned pruned "origin --prune --prune-tags" "name"
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +0000779test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000780test_configured_prune_type unset unset unset unset pruned pruned "--prune --prune-tags origin" "name"
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +0000781test_configured_prune_type unset unset unset unset kept pruned "--prune --prune-tags origin" "link"
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000782test_configured_prune_type unset unset true unset pruned pruned "--prune origin" "name"
783test_configured_prune_type unset unset true unset kept pruned "--prune origin" "link"
784test_configured_prune_type unset unset unset true pruned pruned "--prune origin" "name"
785test_configured_prune_type unset unset unset true kept pruned "--prune origin" "link"
786test_configured_prune_type true unset true unset pruned pruned "origin" "name"
787test_configured_prune_type true unset true unset kept pruned "origin" "link"
788test_configured_prune_type unset true true unset pruned pruned "origin" "name"
789test_configured_prune_type unset true true unset kept pruned "origin" "link"
790test_configured_prune_type unset true unset true pruned pruned "origin" "name"
791test_configured_prune_type unset true unset true kept pruned "origin" "link"
792
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +0000793# When all remote.origin.fetch settings are deleted a --prune
794# --prune-tags still implicitly supplies refs/tags/*:refs/tags/* so
795# tags, but not tracking branches, will be deleted.
Ævar Arnfjörð Bjarmason97716d22018-02-09 20:32:15 +0000796test_expect_success 'remove remote.origin.fetch "one"' '
797 (
798 cd one &&
799 git config --unset-all remote.origin.fetch
800 )
801'
802test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "name"
Ævar Arnfjörð Bjarmason63179722018-02-09 20:32:16 +0000803test_configured_prune_type unset unset unset unset kept pruned "origin --prune --prune-tags" "link"
Michael Schubert737c5a92013-07-13 11:36:24 +0200804
Thomas Rastefe4be12012-03-01 22:40:51 +0100805test_expect_success 'all boundary commits are excluded' '
806 test_commit base &&
807 test_commit oneside &&
808 git checkout HEAD^ &&
809 test_commit otherside &&
810 git checkout master &&
811 test_tick &&
812 git merge otherside &&
813 ad=$(git log --no-walk --format=%ad HEAD) &&
814 git bundle create twoside-boundary.bdl master --since="$ad" &&
815 convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
816 pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
817 test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
Junio C Hamano7be1d622006-09-23 03:40:17 -0700818'
819
Tom Miller4b3b33a2014-01-02 20:28:51 -0600820test_expect_success 'fetch --prune prints the remotes url' '
821 git branch goodbye &&
822 git clone . only-prunes &&
823 git branch -D goodbye &&
824 (
825 cd only-prunes &&
826 git fetch --prune origin 2>&1 | head -n1 >../actual
827 ) &&
828 echo "From ${D}/." >expect &&
Vasco Almeida1edbaac2016-06-17 20:21:07 +0000829 test_i18ncmp expect actual
Tom Miller4b3b33a2014-01-02 20:28:51 -0600830'
831
Tom Miller10a6cc82014-01-02 20:28:52 -0600832test_expect_success 'branchname D/F conflict resolved by --prune' '
833 git branch dir/file &&
834 git clone . prune-df-conflict &&
835 git branch -D dir/file &&
836 git branch dir &&
837 (
838 cd prune-df-conflict &&
839 git fetch --prune &&
840 git rev-parse origin/dir >../actual
841 ) &&
842 git rev-parse dir >expect &&
843 test_cmp expect actual
844'
845
Jeff King4c224082014-01-15 05:46:13 -0500846test_expect_success 'fetching a one-level ref works' '
847 test_commit extra &&
848 git reset --hard HEAD^ &&
849 git update-ref refs/foo extra &&
850 git init one-level &&
851 (
852 cd one-level &&
853 git fetch .. HEAD refs/foo
854 )
855'
856
Johannes Schindelin0898c962016-01-13 18:20:11 +0100857test_expect_success 'fetching with auto-gc does not lock up' '
858 write_script askyesno <<-\EOF &&
859 echo "$*" &&
860 false
861 EOF
862 git clone "file://$D" auto-gc &&
863 test_commit test2 &&
Michael J Gruber816c1932016-03-04 11:53:50 +0100864 (
865 cd auto-gc &&
866 git config gc.autoPackLimit 1 &&
SZEDER Gáborbb055102016-05-01 17:37:43 +0200867 git config gc.autoDetach false &&
Michael J Gruber816c1932016-03-04 11:53:50 +0100868 GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
869 ! grep "Should I try again" fetch.out
870 )
Johannes Schindelin0898c962016-01-13 18:20:11 +0100871'
872
Vasco Almeida377d7de2016-07-26 12:58:54 +0000873test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200874 git clone . full-output &&
875 test_commit looooooooooooong-tag &&
876 (
877 cd full-output &&
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200878 git -c fetch.output=full fetch origin 2>&1 | \
Nguyễn Thái Ngọc Duy6bc91f22016-07-01 18:03:30 +0200879 grep -e "->" | cut -c 22- >../actual
880 ) &&
881 cat >expect <<-\EOF &&
882 master -> origin/master
883 looooooooooooong-tag -> looooooooooooong-tag
884 EOF
885 test_cmp expect actual
886'
887
Vasco Almeida377d7de2016-07-26 12:58:54 +0000888test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
Nguyễn Thái Ngọc Duybc437d12016-07-01 18:03:31 +0200889 git clone . compact &&
890 test_commit extraaa &&
891 (
892 cd compact &&
893 git -c fetch.output=compact fetch origin 2>&1 | \
894 grep -e "->" | cut -c 22- >../actual
895 ) &&
896 cat >expect <<-\EOF &&
897 master -> origin/*
898 extraaa -> *
899 EOF
900 test_cmp expect actual
901'
902
Junio C Hamano7be1d622006-09-23 03:40:17 -0700903test_done