]>
Commit | Line | Data |
---|---|---|
1 | #!/bin/sh | |
2 | # | |
3 | # Copyright (c) 2009 Red Hat, Inc. | |
4 | # | |
5 | ||
6 | test_description='Test updating submodules | |
7 | ||
8 | This test verifies that "git submodule update" detaches the HEAD of the | |
9 | submodule and "git submodule update --rebase/--merge" does not detach the HEAD. | |
10 | ' | |
11 | ||
12 | . ./test-lib.sh | |
13 | ||
14 | ||
15 | compare_head() | |
16 | { | |
17 | sha_master=$(git rev-list --max-count=1 master) | |
18 | sha_head=$(git rev-list --max-count=1 HEAD) | |
19 | ||
20 | test "$sha_master" = "$sha_head" | |
21 | } | |
22 | ||
23 | ||
24 | test_expect_success 'setup a submodule tree' ' | |
25 | echo file > file && | |
26 | git add file && | |
27 | test_tick && | |
28 | git commit -m upstream && | |
29 | git clone . super && | |
30 | git clone super submodule && | |
31 | git clone super rebasing && | |
32 | git clone super merging && | |
33 | git clone super none && | |
34 | (cd super && | |
35 | git submodule add ../submodule submodule && | |
36 | test_tick && | |
37 | git commit -m "submodule" && | |
38 | git submodule init submodule | |
39 | ) && | |
40 | (cd submodule && | |
41 | echo "line2" > file && | |
42 | git add file && | |
43 | git commit -m "Commit 2" | |
44 | ) && | |
45 | (cd super && | |
46 | (cd submodule && | |
47 | git pull --rebase origin | |
48 | ) && | |
49 | git add submodule && | |
50 | git commit -m "submodule update" | |
51 | ) && | |
52 | (cd super && | |
53 | git submodule add ../rebasing rebasing && | |
54 | test_tick && | |
55 | git commit -m "rebasing" | |
56 | ) && | |
57 | (cd super && | |
58 | git submodule add ../merging merging && | |
59 | test_tick && | |
60 | git commit -m "rebasing" | |
61 | ) && | |
62 | (cd super && | |
63 | git submodule add ../none none && | |
64 | test_tick && | |
65 | git commit -m "none" | |
66 | ) && | |
67 | git clone . recursivesuper && | |
68 | ( cd recursivesuper && | |
69 | git submodule add ../super super | |
70 | ) | |
71 | ' | |
72 | ||
73 | test_expect_success 'submodule update detaching the HEAD ' ' | |
74 | (cd super/submodule && | |
75 | git reset --hard HEAD~1 | |
76 | ) && | |
77 | (cd super && | |
78 | (cd submodule && | |
79 | compare_head | |
80 | ) && | |
81 | git submodule update submodule && | |
82 | cd submodule && | |
83 | ! compare_head | |
84 | ) | |
85 | ' | |
86 | ||
87 | test_expect_success 'submodule update from subdirectory' ' | |
88 | (cd super/submodule && | |
89 | git reset --hard HEAD~1 | |
90 | ) && | |
91 | mkdir super/sub && | |
92 | (cd super/sub && | |
93 | (cd ../submodule && | |
94 | compare_head | |
95 | ) && | |
96 | git submodule update ../submodule && | |
97 | cd ../submodule && | |
98 | ! compare_head | |
99 | ) | |
100 | ' | |
101 | ||
102 | supersha1=$(git -C super rev-parse HEAD) | |
103 | mergingsha1=$(git -C super/merging rev-parse HEAD) | |
104 | nonesha1=$(git -C super/none rev-parse HEAD) | |
105 | rebasingsha1=$(git -C super/rebasing rev-parse HEAD) | |
106 | submodulesha1=$(git -C super/submodule rev-parse HEAD) | |
107 | pwd=$(pwd) | |
108 | ||
109 | cat <<EOF >expect | |
110 | Submodule path '../super': checked out '$supersha1' | |
111 | Submodule path '../super/merging': checked out '$mergingsha1' | |
112 | Submodule path '../super/none': checked out '$nonesha1' | |
113 | Submodule path '../super/rebasing': checked out '$rebasingsha1' | |
114 | Submodule path '../super/submodule': checked out '$submodulesha1' | |
115 | EOF | |
116 | ||
117 | cat <<EOF >expect2 | |
118 | Submodule 'merging' ($pwd/merging) registered for path '../super/merging' | |
119 | Submodule 'none' ($pwd/none) registered for path '../super/none' | |
120 | Submodule 'rebasing' ($pwd/rebasing) registered for path '../super/rebasing' | |
121 | Submodule 'submodule' ($pwd/submodule) registered for path '../super/submodule' | |
122 | Cloning into '$pwd/recursivesuper/super/merging'... | |
123 | done. | |
124 | Cloning into '$pwd/recursivesuper/super/none'... | |
125 | done. | |
126 | Cloning into '$pwd/recursivesuper/super/rebasing'... | |
127 | done. | |
128 | Cloning into '$pwd/recursivesuper/super/submodule'... | |
129 | done. | |
130 | EOF | |
131 | ||
132 | test_expect_success 'submodule update --init --recursive from subdirectory' ' | |
133 | git -C recursivesuper/super reset --hard HEAD^ && | |
134 | (cd recursivesuper && | |
135 | mkdir tmp && | |
136 | cd tmp && | |
137 | git submodule update --init --recursive ../super >../../actual 2>../../actual2 | |
138 | ) && | |
139 | test_i18ncmp expect actual && | |
140 | test_i18ncmp expect2 actual2 | |
141 | ' | |
142 | ||
143 | cat <<EOF >expect2 | |
144 | Submodule 'foo/sub' ($pwd/withsubs/../rebasing) registered for path 'sub' | |
145 | EOF | |
146 | ||
147 | test_expect_success 'submodule update --init from and of subdirectory' ' | |
148 | git init withsubs && | |
149 | (cd withsubs && | |
150 | mkdir foo && | |
151 | git submodule add "$(pwd)/../rebasing" foo/sub && | |
152 | (cd foo && | |
153 | git submodule deinit -f sub && | |
154 | git submodule update --init sub 2>../../actual2 | |
155 | ) | |
156 | ) && | |
157 | test_i18ncmp expect2 actual2 | |
158 | ' | |
159 | ||
160 | apos="'"; | |
161 | test_expect_success 'submodule update does not fetch already present commits' ' | |
162 | (cd submodule && | |
163 | echo line3 >> file && | |
164 | git add file && | |
165 | test_tick && | |
166 | git commit -m "upstream line3" | |
167 | ) && | |
168 | (cd super/submodule && | |
169 | head=$(git rev-parse --verify HEAD) && | |
170 | echo "Submodule path ${apos}submodule$apos: checked out $apos$head$apos" > ../../expected && | |
171 | git reset --hard HEAD~1 | |
172 | ) && | |
173 | (cd super && | |
174 | git submodule update > ../actual 2> ../actual.err | |
175 | ) && | |
176 | test_i18ncmp expected actual && | |
177 | ! test -s actual.err | |
178 | ' | |
179 | ||
180 | test_expect_success 'submodule update should fail due to local changes' ' | |
181 | (cd super/submodule && | |
182 | git reset --hard HEAD~1 && | |
183 | echo "local change" > file | |
184 | ) && | |
185 | (cd super && | |
186 | (cd submodule && | |
187 | compare_head | |
188 | ) && | |
189 | test_must_fail git submodule update submodule | |
190 | ) | |
191 | ' | |
192 | test_expect_success 'submodule update should throw away changes with --force ' ' | |
193 | (cd super && | |
194 | (cd submodule && | |
195 | compare_head | |
196 | ) && | |
197 | git submodule update --force submodule && | |
198 | cd submodule && | |
199 | ! compare_head | |
200 | ) | |
201 | ' | |
202 | ||
203 | test_expect_success 'submodule update --force forcibly checks out submodules' ' | |
204 | (cd super && | |
205 | (cd submodule && | |
206 | rm -f file | |
207 | ) && | |
208 | git submodule update --force submodule && | |
209 | (cd submodule && | |
210 | test "$(git status -s file)" = "" | |
211 | ) | |
212 | ) | |
213 | ' | |
214 | ||
215 | test_expect_success 'submodule update --remote should fetch upstream changes' ' | |
216 | (cd submodule && | |
217 | echo line4 >> file && | |
218 | git add file && | |
219 | test_tick && | |
220 | git commit -m "upstream line4" | |
221 | ) && | |
222 | (cd super && | |
223 | git submodule update --remote --force submodule && | |
224 | cd submodule && | |
225 | test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline)" | |
226 | ) | |
227 | ' | |
228 | ||
229 | test_expect_success 'submodule update --remote should fetch upstream changes with .' ' | |
230 | ( | |
231 | cd super && | |
232 | git config -f .gitmodules submodule."submodule".branch "." && | |
233 | git add .gitmodules && | |
234 | git commit -m "submodules: update from the respective superproject branch" | |
235 | ) && | |
236 | ( | |
237 | cd submodule && | |
238 | echo line4a >> file && | |
239 | git add file && | |
240 | test_tick && | |
241 | git commit -m "upstream line4a" && | |
242 | git checkout -b test-branch && | |
243 | test_commit on-test-branch | |
244 | ) && | |
245 | ( | |
246 | cd super && | |
247 | git submodule update --remote --force submodule && | |
248 | git -C submodule log -1 --oneline >actual && | |
249 | git -C ../submodule log -1 --oneline master >expect && | |
250 | test_cmp expect actual && | |
251 | git checkout -b test-branch && | |
252 | git submodule update --remote --force submodule && | |
253 | git -C submodule log -1 --oneline >actual && | |
254 | git -C ../submodule log -1 --oneline test-branch >expect && | |
255 | test_cmp expect actual && | |
256 | git checkout master && | |
257 | git branch -d test-branch && | |
258 | git reset --hard HEAD^ | |
259 | ) | |
260 | ' | |
261 | ||
262 | test_expect_success 'local config should override .gitmodules branch' ' | |
263 | (cd submodule && | |
264 | git checkout test-branch && | |
265 | echo line5 >> file && | |
266 | git add file && | |
267 | test_tick && | |
268 | git commit -m "upstream line5" && | |
269 | git checkout master | |
270 | ) && | |
271 | (cd super && | |
272 | git config submodule.submodule.branch test-branch && | |
273 | git submodule update --remote --force submodule && | |
274 | cd submodule && | |
275 | test "$(git log -1 --oneline)" = "$(GIT_DIR=../../submodule/.git git log -1 --oneline test-branch)" | |
276 | ) | |
277 | ' | |
278 | ||
279 | test_expect_success 'submodule update --rebase staying on master' ' | |
280 | (cd super/submodule && | |
281 | git checkout master | |
282 | ) && | |
283 | (cd super && | |
284 | (cd submodule && | |
285 | compare_head | |
286 | ) && | |
287 | git submodule update --rebase submodule && | |
288 | cd submodule && | |
289 | compare_head | |
290 | ) | |
291 | ' | |
292 | ||
293 | test_expect_success 'submodule update --merge staying on master' ' | |
294 | (cd super/submodule && | |
295 | git reset --hard HEAD~1 | |
296 | ) && | |
297 | (cd super && | |
298 | (cd submodule && | |
299 | compare_head | |
300 | ) && | |
301 | git submodule update --merge submodule && | |
302 | cd submodule && | |
303 | compare_head | |
304 | ) | |
305 | ' | |
306 | ||
307 | test_expect_success 'submodule update - rebase in .git/config' ' | |
308 | (cd super && | |
309 | git config submodule.submodule.update rebase | |
310 | ) && | |
311 | (cd super/submodule && | |
312 | git reset --hard HEAD~1 | |
313 | ) && | |
314 | (cd super && | |
315 | (cd submodule && | |
316 | compare_head | |
317 | ) && | |
318 | git submodule update submodule && | |
319 | cd submodule && | |
320 | compare_head | |
321 | ) | |
322 | ' | |
323 | ||
324 | test_expect_success 'submodule update - checkout in .git/config but --rebase given' ' | |
325 | (cd super && | |
326 | git config submodule.submodule.update checkout | |
327 | ) && | |
328 | (cd super/submodule && | |
329 | git reset --hard HEAD~1 | |
330 | ) && | |
331 | (cd super && | |
332 | (cd submodule && | |
333 | compare_head | |
334 | ) && | |
335 | git submodule update --rebase submodule && | |
336 | cd submodule && | |
337 | compare_head | |
338 | ) | |
339 | ' | |
340 | ||
341 | test_expect_success 'submodule update - merge in .git/config' ' | |
342 | (cd super && | |
343 | git config submodule.submodule.update merge | |
344 | ) && | |
345 | (cd super/submodule && | |
346 | git reset --hard HEAD~1 | |
347 | ) && | |
348 | (cd super && | |
349 | (cd submodule && | |
350 | compare_head | |
351 | ) && | |
352 | git submodule update submodule && | |
353 | cd submodule && | |
354 | compare_head | |
355 | ) | |
356 | ' | |
357 | ||
358 | test_expect_success 'submodule update - checkout in .git/config but --merge given' ' | |
359 | (cd super && | |
360 | git config submodule.submodule.update checkout | |
361 | ) && | |
362 | (cd super/submodule && | |
363 | git reset --hard HEAD~1 | |
364 | ) && | |
365 | (cd super && | |
366 | (cd submodule && | |
367 | compare_head | |
368 | ) && | |
369 | git submodule update --merge submodule && | |
370 | cd submodule && | |
371 | compare_head | |
372 | ) | |
373 | ' | |
374 | ||
375 | test_expect_success 'submodule update - checkout in .git/config' ' | |
376 | (cd super && | |
377 | git config submodule.submodule.update checkout | |
378 | ) && | |
379 | (cd super/submodule && | |
380 | git reset --hard HEAD^ | |
381 | ) && | |
382 | (cd super && | |
383 | (cd submodule && | |
384 | compare_head | |
385 | ) && | |
386 | git submodule update submodule && | |
387 | cd submodule && | |
388 | ! compare_head | |
389 | ) | |
390 | ' | |
391 | ||
392 | test_expect_success 'submodule update - command in .git/config' ' | |
393 | (cd super && | |
394 | git config submodule.submodule.update "!git checkout" | |
395 | ) && | |
396 | (cd super/submodule && | |
397 | git reset --hard HEAD^ | |
398 | ) && | |
399 | (cd super && | |
400 | (cd submodule && | |
401 | compare_head | |
402 | ) && | |
403 | git submodule update submodule && | |
404 | cd submodule && | |
405 | ! compare_head | |
406 | ) | |
407 | ' | |
408 | ||
409 | test_expect_success 'submodule update - command in .gitmodules is ignored' ' | |
410 | test_when_finished "git -C super reset --hard HEAD^" && | |
411 | git -C super config -f .gitmodules submodule.submodule.update "!false" && | |
412 | git -C super commit -a -m "add command to .gitmodules file" && | |
413 | git -C super/submodule reset --hard $submodulesha1^ && | |
414 | git -C super submodule update submodule | |
415 | ' | |
416 | ||
417 | cat << EOF >expect | |
418 | Execution of 'false $submodulesha1' failed in submodule path 'submodule' | |
419 | EOF | |
420 | ||
421 | test_expect_success 'submodule update - command in .git/config catches failure' ' | |
422 | (cd super && | |
423 | git config submodule.submodule.update "!false" | |
424 | ) && | |
425 | (cd super/submodule && | |
426 | git reset --hard $submodulesha1^ | |
427 | ) && | |
428 | (cd super && | |
429 | test_must_fail git submodule update submodule 2>../actual | |
430 | ) && | |
431 | test_i18ncmp actual expect | |
432 | ' | |
433 | ||
434 | cat << EOF >expect | |
435 | Execution of 'false $submodulesha1' failed in submodule path '../submodule' | |
436 | EOF | |
437 | ||
438 | test_expect_success 'submodule update - command in .git/config catches failure -- subdirectory' ' | |
439 | (cd super && | |
440 | git config submodule.submodule.update "!false" | |
441 | ) && | |
442 | (cd super/submodule && | |
443 | git reset --hard $submodulesha1^ | |
444 | ) && | |
445 | (cd super && | |
446 | mkdir tmp && cd tmp && | |
447 | test_must_fail git submodule update ../submodule 2>../../actual | |
448 | ) && | |
449 | test_i18ncmp actual expect | |
450 | ' | |
451 | ||
452 | test_expect_success 'submodule update - command run for initial population of submodule' ' | |
453 | cat >expect <<-EOF && | |
454 | Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\'' | |
455 | EOF | |
456 | rm -rf super/submodule && | |
457 | test_must_fail git -C super submodule update 2>actual && | |
458 | test_i18ncmp expect actual && | |
459 | git -C super submodule update --checkout | |
460 | ' | |
461 | ||
462 | cat << EOF >expect | |
463 | Execution of 'false $submodulesha1' failed in submodule path '../super/submodule' | |
464 | Failed to recurse into submodule path '../super' | |
465 | EOF | |
466 | ||
467 | test_expect_success 'recursive submodule update - command in .git/config catches failure -- subdirectory' ' | |
468 | (cd recursivesuper && | |
469 | git submodule update --remote super && | |
470 | git add super && | |
471 | git commit -m "update to latest to have more than one commit in submodules" | |
472 | ) && | |
473 | git -C recursivesuper/super config submodule.submodule.update "!false" && | |
474 | git -C recursivesuper/super/submodule reset --hard $submodulesha1^ && | |
475 | (cd recursivesuper && | |
476 | mkdir -p tmp && cd tmp && | |
477 | test_must_fail git submodule update --recursive ../super 2>../../actual | |
478 | ) && | |
479 | test_i18ncmp actual expect | |
480 | ' | |
481 | ||
482 | test_expect_success 'submodule init does not copy command into .git/config' ' | |
483 | (cd super && | |
484 | H=$(git ls-files -s submodule | cut -d" " -f2) && | |
485 | mkdir submodule1 && | |
486 | git update-index --add --cacheinfo 160000 $H submodule1 && | |
487 | git config -f .gitmodules submodule.submodule1.path submodule1 && | |
488 | git config -f .gitmodules submodule.submodule1.url ../submodule && | |
489 | git config -f .gitmodules submodule.submodule1.update !false && | |
490 | git submodule init submodule1 && | |
491 | echo "none" >expect && | |
492 | git config submodule.submodule1.update >actual && | |
493 | test_cmp expect actual | |
494 | ) | |
495 | ' | |
496 | ||
497 | test_expect_success 'submodule init picks up rebase' ' | |
498 | (cd super && | |
499 | git config -f .gitmodules submodule.rebasing.update rebase && | |
500 | git submodule init rebasing && | |
501 | test "rebase" = "$(git config submodule.rebasing.update)" | |
502 | ) | |
503 | ' | |
504 | ||
505 | test_expect_success 'submodule init picks up merge' ' | |
506 | (cd super && | |
507 | git config -f .gitmodules submodule.merging.update merge && | |
508 | git submodule init merging && | |
509 | test "merge" = "$(git config submodule.merging.update)" | |
510 | ) | |
511 | ' | |
512 | ||
513 | test_expect_success 'submodule update --merge - ignores --merge for new submodules' ' | |
514 | test_config -C super submodule.submodule.update checkout && | |
515 | (cd super && | |
516 | rm -rf submodule && | |
517 | git submodule update submodule && | |
518 | git status -s submodule >expect && | |
519 | rm -rf submodule && | |
520 | git submodule update --merge submodule && | |
521 | git status -s submodule >actual && | |
522 | test_cmp expect actual | |
523 | ) | |
524 | ' | |
525 | ||
526 | test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' ' | |
527 | test_config -C super submodule.submodule.update checkout && | |
528 | (cd super && | |
529 | rm -rf submodule && | |
530 | git submodule update submodule && | |
531 | git status -s submodule >expect && | |
532 | rm -rf submodule && | |
533 | git submodule update --rebase submodule && | |
534 | git status -s submodule >actual && | |
535 | test_cmp expect actual | |
536 | ) | |
537 | ' | |
538 | ||
539 | test_expect_success 'submodule update ignores update=merge config for new submodules' ' | |
540 | (cd super && | |
541 | rm -rf submodule && | |
542 | git submodule update submodule && | |
543 | git status -s submodule >expect && | |
544 | rm -rf submodule && | |
545 | git config submodule.submodule.update merge && | |
546 | git submodule update submodule && | |
547 | git status -s submodule >actual && | |
548 | git config --unset submodule.submodule.update && | |
549 | test_cmp expect actual | |
550 | ) | |
551 | ' | |
552 | ||
553 | test_expect_success 'submodule update ignores update=rebase config for new submodules' ' | |
554 | (cd super && | |
555 | rm -rf submodule && | |
556 | git submodule update submodule && | |
557 | git status -s submodule >expect && | |
558 | rm -rf submodule && | |
559 | git config submodule.submodule.update rebase && | |
560 | git submodule update submodule && | |
561 | git status -s submodule >actual && | |
562 | git config --unset submodule.submodule.update && | |
563 | test_cmp expect actual | |
564 | ) | |
565 | ' | |
566 | ||
567 | test_expect_success 'submodule init picks up update=none' ' | |
568 | (cd super && | |
569 | git config -f .gitmodules submodule.none.update none && | |
570 | git submodule init none && | |
571 | test "none" = "$(git config submodule.none.update)" | |
572 | ) | |
573 | ' | |
574 | ||
575 | test_expect_success 'submodule update - update=none in .git/config' ' | |
576 | (cd super && | |
577 | git config submodule.submodule.update none && | |
578 | (cd submodule && | |
579 | git checkout master && | |
580 | compare_head | |
581 | ) && | |
582 | git diff --raw | grep " submodule" && | |
583 | git submodule update && | |
584 | git diff --raw | grep " submodule" && | |
585 | (cd submodule && | |
586 | compare_head | |
587 | ) && | |
588 | git config --unset submodule.submodule.update && | |
589 | git submodule update submodule | |
590 | ) | |
591 | ' | |
592 | ||
593 | test_expect_success 'submodule update - update=none in .git/config but --checkout given' ' | |
594 | (cd super && | |
595 | git config submodule.submodule.update none && | |
596 | (cd submodule && | |
597 | git checkout master && | |
598 | compare_head | |
599 | ) && | |
600 | git diff --raw | grep " submodule" && | |
601 | git submodule update --checkout && | |
602 | test_must_fail git diff --raw \| grep " submodule" && | |
603 | (cd submodule && | |
604 | test_must_fail compare_head | |
605 | ) && | |
606 | git config --unset submodule.submodule.update | |
607 | ) | |
608 | ' | |
609 | ||
610 | test_expect_success 'submodule update --init skips submodule with update=none' ' | |
611 | (cd super && | |
612 | git add .gitmodules && | |
613 | git commit -m ".gitmodules" | |
614 | ) && | |
615 | git clone super cloned && | |
616 | (cd cloned && | |
617 | git submodule update --init && | |
618 | test -e submodule/.git && | |
619 | test_must_fail test -e none/.git | |
620 | ) | |
621 | ' | |
622 | ||
623 | test_expect_success 'submodule update continues after checkout error' ' | |
624 | (cd super && | |
625 | git reset --hard HEAD && | |
626 | git submodule add ../submodule submodule2 && | |
627 | git submodule init && | |
628 | git commit -am "new_submodule" && | |
629 | (cd submodule2 && | |
630 | git rev-parse --verify HEAD >../expect | |
631 | ) && | |
632 | (cd submodule && | |
633 | test_commit "update_submodule" file | |
634 | ) && | |
635 | (cd submodule2 && | |
636 | test_commit "update_submodule2" file | |
637 | ) && | |
638 | git add submodule && | |
639 | git add submodule2 && | |
640 | git commit -m "two_new_submodule_commits" && | |
641 | (cd submodule && | |
642 | echo "" > file | |
643 | ) && | |
644 | git checkout HEAD^ && | |
645 | test_must_fail git submodule update && | |
646 | (cd submodule2 && | |
647 | git rev-parse --verify HEAD >../actual | |
648 | ) && | |
649 | test_cmp expect actual | |
650 | ) | |
651 | ' | |
652 | test_expect_success 'submodule update continues after recursive checkout error' ' | |
653 | (cd super && | |
654 | git reset --hard HEAD && | |
655 | git checkout master && | |
656 | git submodule update && | |
657 | (cd submodule && | |
658 | git submodule add ../submodule subsubmodule && | |
659 | git submodule init && | |
660 | git commit -m "new_subsubmodule" | |
661 | ) && | |
662 | git add submodule && | |
663 | git commit -m "update_submodule" && | |
664 | (cd submodule && | |
665 | (cd subsubmodule && | |
666 | test_commit "update_subsubmodule" file | |
667 | ) && | |
668 | git add subsubmodule && | |
669 | test_commit "update_submodule_again" file && | |
670 | (cd subsubmodule && | |
671 | test_commit "update_subsubmodule_again" file | |
672 | ) && | |
673 | test_commit "update_submodule_again_again" file | |
674 | ) && | |
675 | (cd submodule2 && | |
676 | git rev-parse --verify HEAD >../expect && | |
677 | test_commit "update_submodule2_again" file | |
678 | ) && | |
679 | git add submodule && | |
680 | git add submodule2 && | |
681 | git commit -m "new_commits" && | |
682 | git checkout HEAD^ && | |
683 | (cd submodule && | |
684 | git checkout HEAD^ && | |
685 | (cd subsubmodule && | |
686 | echo "" > file | |
687 | ) | |
688 | ) && | |
689 | test_must_fail git submodule update --recursive && | |
690 | (cd submodule2 && | |
691 | git rev-parse --verify HEAD >../actual | |
692 | ) && | |
693 | test_cmp expect actual | |
694 | ) | |
695 | ' | |
696 | ||
697 | test_expect_success 'submodule update exit immediately in case of merge conflict' ' | |
698 | (cd super && | |
699 | git checkout master && | |
700 | git reset --hard HEAD && | |
701 | (cd submodule && | |
702 | (cd subsubmodule && | |
703 | git reset --hard HEAD | |
704 | ) | |
705 | ) && | |
706 | git submodule update --recursive && | |
707 | (cd submodule && | |
708 | test_commit "update_submodule_2" file | |
709 | ) && | |
710 | (cd submodule2 && | |
711 | test_commit "update_submodule2_2" file | |
712 | ) && | |
713 | git add submodule && | |
714 | git add submodule2 && | |
715 | git commit -m "two_new_submodule_commits" && | |
716 | (cd submodule && | |
717 | git checkout master && | |
718 | test_commit "conflict" file && | |
719 | echo "conflict" > file | |
720 | ) && | |
721 | git checkout HEAD^ && | |
722 | (cd submodule2 && | |
723 | git rev-parse --verify HEAD >../expect | |
724 | ) && | |
725 | git config submodule.submodule.update merge && | |
726 | test_must_fail git submodule update && | |
727 | (cd submodule2 && | |
728 | git rev-parse --verify HEAD >../actual | |
729 | ) && | |
730 | test_cmp expect actual | |
731 | ) | |
732 | ' | |
733 | ||
734 | test_expect_success 'submodule update exit immediately after recursive rebase error' ' | |
735 | (cd super && | |
736 | git checkout master && | |
737 | git reset --hard HEAD && | |
738 | (cd submodule && | |
739 | git reset --hard HEAD && | |
740 | git submodule update --recursive | |
741 | ) && | |
742 | (cd submodule && | |
743 | test_commit "update_submodule_3" file | |
744 | ) && | |
745 | (cd submodule2 && | |
746 | test_commit "update_submodule2_3" file | |
747 | ) && | |
748 | git add submodule && | |
749 | git add submodule2 && | |
750 | git commit -m "two_new_submodule_commits" && | |
751 | (cd submodule && | |
752 | git checkout master && | |
753 | test_commit "conflict2" file && | |
754 | echo "conflict" > file | |
755 | ) && | |
756 | git checkout HEAD^ && | |
757 | (cd submodule2 && | |
758 | git rev-parse --verify HEAD >../expect | |
759 | ) && | |
760 | git config submodule.submodule.update rebase && | |
761 | test_must_fail git submodule update && | |
762 | (cd submodule2 && | |
763 | git rev-parse --verify HEAD >../actual | |
764 | ) && | |
765 | test_cmp expect actual | |
766 | ) | |
767 | ' | |
768 | ||
769 | test_expect_success 'add different submodules to the same path' ' | |
770 | (cd super && | |
771 | git submodule add ../submodule s1 && | |
772 | test_must_fail git submodule add ../merging s1 | |
773 | ) | |
774 | ' | |
775 | ||
776 | test_expect_success 'submodule add places git-dir in superprojects git-dir' ' | |
777 | (cd super && | |
778 | mkdir deeper && | |
779 | git submodule add ../submodule deeper/submodule && | |
780 | (cd deeper/submodule && | |
781 | git log > ../../expected | |
782 | ) && | |
783 | (cd .git/modules/deeper/submodule && | |
784 | git log > ../../../../actual | |
785 | ) && | |
786 | test_cmp actual expected | |
787 | ) | |
788 | ' | |
789 | ||
790 | test_expect_success 'submodule update places git-dir in superprojects git-dir' ' | |
791 | (cd super && | |
792 | git commit -m "added submodule" | |
793 | ) && | |
794 | git clone super super2 && | |
795 | (cd super2 && | |
796 | git submodule init deeper/submodule && | |
797 | git submodule update && | |
798 | (cd deeper/submodule && | |
799 | git log > ../../expected | |
800 | ) && | |
801 | (cd .git/modules/deeper/submodule && | |
802 | git log > ../../../../actual | |
803 | ) && | |
804 | test_cmp actual expected | |
805 | ) | |
806 | ' | |
807 | ||
808 | test_expect_success 'submodule add places git-dir in superprojects git-dir recursive' ' | |
809 | (cd super2 && | |
810 | (cd deeper/submodule && | |
811 | git submodule add ../submodule subsubmodule && | |
812 | (cd subsubmodule && | |
813 | git log > ../../../expected | |
814 | ) && | |
815 | git commit -m "added subsubmodule" && | |
816 | git push origin : | |
817 | ) && | |
818 | (cd .git/modules/deeper/submodule/modules/subsubmodule && | |
819 | git log > ../../../../../actual | |
820 | ) && | |
821 | git add deeper/submodule && | |
822 | git commit -m "update submodule" && | |
823 | git push origin : && | |
824 | test_cmp actual expected | |
825 | ) | |
826 | ' | |
827 | ||
828 | test_expect_success 'submodule update places git-dir in superprojects git-dir recursive' ' | |
829 | mkdir super_update_r && | |
830 | (cd super_update_r && | |
831 | git init --bare | |
832 | ) && | |
833 | mkdir subsuper_update_r && | |
834 | (cd subsuper_update_r && | |
835 | git init --bare | |
836 | ) && | |
837 | mkdir subsubsuper_update_r && | |
838 | (cd subsubsuper_update_r && | |
839 | git init --bare | |
840 | ) && | |
841 | git clone subsubsuper_update_r subsubsuper_update_r2 && | |
842 | (cd subsubsuper_update_r2 && | |
843 | test_commit "update_subsubsuper" file && | |
844 | git push origin master | |
845 | ) && | |
846 | git clone subsuper_update_r subsuper_update_r2 && | |
847 | (cd subsuper_update_r2 && | |
848 | test_commit "update_subsuper" file && | |
849 | git submodule add ../subsubsuper_update_r subsubmodule && | |
850 | git commit -am "subsubmodule" && | |
851 | git push origin master | |
852 | ) && | |
853 | git clone super_update_r super_update_r2 && | |
854 | (cd super_update_r2 && | |
855 | test_commit "update_super" file && | |
856 | git submodule add ../subsuper_update_r submodule && | |
857 | git commit -am "submodule" && | |
858 | git push origin master | |
859 | ) && | |
860 | rm -rf super_update_r2 && | |
861 | git clone super_update_r super_update_r2 && | |
862 | (cd super_update_r2 && | |
863 | git submodule update --init --recursive >actual && | |
864 | test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && | |
865 | (cd submodule/subsubmodule && | |
866 | git log > ../../expected | |
867 | ) && | |
868 | (cd .git/modules/submodule/modules/subsubmodule && | |
869 | git log > ../../../../../actual | |
870 | ) && | |
871 | test_cmp actual expected | |
872 | ) | |
873 | ' | |
874 | ||
875 | test_expect_success 'submodule add properly re-creates deeper level submodules' ' | |
876 | (cd super && | |
877 | git reset --hard master && | |
878 | rm -rf deeper/ && | |
879 | git submodule add --force ../submodule deeper/submodule | |
880 | ) | |
881 | ' | |
882 | ||
883 | test_expect_success 'submodule update properly revives a moved submodule' ' | |
884 | (cd super && | |
885 | H=$(git rev-parse --short HEAD) && | |
886 | git commit -am "pre move" && | |
887 | H2=$(git rev-parse --short HEAD) && | |
888 | git status | sed "s/$H/XXX/" >expect && | |
889 | H=$(cd submodule2 && git rev-parse HEAD) && | |
890 | git rm --cached submodule2 && | |
891 | rm -rf submodule2 && | |
892 | mkdir -p "moved/sub module" && | |
893 | git update-index --add --cacheinfo 160000 $H "moved/sub module" && | |
894 | git config -f .gitmodules submodule.submodule2.path "moved/sub module" && | |
895 | git commit -am "post move" && | |
896 | git submodule update && | |
897 | git status | sed "s/$H2/XXX/" >actual && | |
898 | test_cmp expect actual | |
899 | ) | |
900 | ' | |
901 | ||
902 | test_expect_success SYMLINKS 'submodule update can handle symbolic links in pwd' ' | |
903 | mkdir -p linked/dir && | |
904 | ln -s linked/dir linkto && | |
905 | (cd linkto && | |
906 | git clone "$TRASH_DIRECTORY"/super_update_r2 super && | |
907 | (cd super && | |
908 | git submodule update --init --recursive | |
909 | ) | |
910 | ) | |
911 | ' | |
912 | ||
913 | test_expect_success 'submodule update clone shallow submodule' ' | |
914 | test_when_finished "rm -rf super3" && | |
915 | first=$(git -C cloned submodule status submodule |cut -c2-41) && | |
916 | second=$(git -C submodule rev-parse HEAD) && | |
917 | commit_count=$(git -C submodule rev-list --count $first^..$second) && | |
918 | git clone cloned super3 && | |
919 | pwd=$(pwd) && | |
920 | ( | |
921 | cd super3 && | |
922 | sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp && | |
923 | mv -f .gitmodules.tmp .gitmodules && | |
924 | git submodule update --init --depth=$commit_count && | |
925 | test 1 = $(git -C submodule log --oneline | wc -l) | |
926 | ) | |
927 | ' | |
928 | ||
929 | test_expect_success 'submodule update clone shallow submodule outside of depth' ' | |
930 | test_when_finished "rm -rf super3" && | |
931 | git clone cloned super3 && | |
932 | pwd=$(pwd) && | |
933 | ( | |
934 | cd super3 && | |
935 | sed -e "s#url = ../#url = file://$pwd/#" <.gitmodules >.gitmodules.tmp && | |
936 | mv -f .gitmodules.tmp .gitmodules && | |
937 | test_must_fail git submodule update --init --depth=1 2>actual && | |
938 | test_i18ngrep "Direct fetching of that commit failed." actual && | |
939 | git -C ../submodule config uploadpack.allowReachableSHA1InWant true && | |
940 | git submodule update --init --depth=1 >actual && | |
941 | test 1 = $(git -C submodule log --oneline | wc -l) | |
942 | ) | |
943 | ' | |
944 | ||
945 | test_expect_success 'submodule update --recursive drops module name before recursing' ' | |
946 | (cd super2 && | |
947 | (cd deeper/submodule/subsubmodule && | |
948 | git checkout HEAD^ | |
949 | ) && | |
950 | git submodule update --recursive deeper/submodule >actual && | |
951 | test_i18ngrep "Submodule path .deeper/submodule/subsubmodule.: checked out" actual | |
952 | ) | |
953 | ' | |
954 | ||
955 | test_expect_success 'submodule update can be run in parallel' ' | |
956 | (cd super2 && | |
957 | GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 7 && | |
958 | grep "7 tasks" trace.out && | |
959 | git config submodule.fetchJobs 8 && | |
960 | GIT_TRACE=$(pwd)/trace.out git submodule update && | |
961 | grep "8 tasks" trace.out && | |
962 | GIT_TRACE=$(pwd)/trace.out git submodule update --jobs 9 && | |
963 | grep "9 tasks" trace.out | |
964 | ) | |
965 | ' | |
966 | ||
967 | test_expect_success 'git clone passes the parallel jobs config on to submodules' ' | |
968 | test_when_finished "rm -rf super4" && | |
969 | GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 7 . super4 && | |
970 | grep "7 tasks" trace.out && | |
971 | rm -rf super4 && | |
972 | git config --global submodule.fetchJobs 8 && | |
973 | GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules . super4 && | |
974 | grep "8 tasks" trace.out && | |
975 | rm -rf super4 && | |
976 | GIT_TRACE=$(pwd)/trace.out git clone --recurse-submodules --jobs 9 . super4 && | |
977 | grep "9 tasks" trace.out && | |
978 | rm -rf super4 | |
979 | ' | |
980 | ||
981 | test_done |