]> git.ipfire.org Git - thirdparty/git.git/blob - t/t9350-fast-export.sh
Sync with 2.34.5
[thirdparty/git.git] / t / t9350-fast-export.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Johannes E. Schindelin
4 #
5
6 test_description='git fast-export'
7 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
8 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
9
10 . ./test-lib.sh
11
12 test_expect_success 'setup' '
13
14 echo break it > file0 &&
15 git add file0 &&
16 test_tick &&
17 echo Wohlauf > file &&
18 git add file &&
19 test_tick &&
20 git commit -m initial &&
21 echo die Luft > file &&
22 echo geht frisch > file2 &&
23 git add file file2 &&
24 test_tick &&
25 git commit -m second &&
26 echo und > file2 &&
27 test_tick &&
28 git commit -m third file2 &&
29 test_tick &&
30 git tag rein &&
31 git checkout -b wer HEAD^ &&
32 echo lange > file2 &&
33 test_tick &&
34 git commit -m sitzt file2 &&
35 test_tick &&
36 git tag -a -m valentin muss &&
37 git merge -s ours main
38
39 '
40
41 test_expect_success 'fast-export | fast-import' '
42
43 MAIN=$(git rev-parse --verify main) &&
44 REIN=$(git rev-parse --verify rein) &&
45 WER=$(git rev-parse --verify wer) &&
46 MUSS=$(git rev-parse --verify muss) &&
47 mkdir new &&
48 git --git-dir=new/.git init &&
49 git fast-export --all >actual &&
50 (cd new &&
51 git fast-import &&
52 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
53 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
54 test $WER = $(git rev-parse --verify refs/heads/wer) &&
55 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
56
57 '
58
59 test_expect_success 'fast-export ^muss^{commit} muss' '
60 git fast-export --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
61 cat >expected <<-EOF &&
62 tag muss
63 from $(git rev-parse --verify muss^{commit})
64 $(git cat-file tag muss | grep tagger)
65 data 9
66 valentin
67
68 EOF
69 test_cmp expected actual
70 '
71
72 test_expect_success 'fast-export --mark-tags ^muss^{commit} muss' '
73 git fast-export --mark-tags --tag-of-filtered-object=rewrite ^muss^{commit} muss >actual &&
74 cat >expected <<-EOF &&
75 tag muss
76 mark :1
77 from $(git rev-parse --verify muss^{commit})
78 $(git cat-file tag muss | grep tagger)
79 data 9
80 valentin
81
82 EOF
83 test_cmp expected actual
84 '
85
86 test_expect_success 'fast-export main~2..main' '
87
88 git fast-export main~2..main >actual &&
89 sed "s/main/partial/" actual |
90 (cd new &&
91 git fast-import &&
92 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
93 git diff --exit-code main partial &&
94 git diff --exit-code main^ partial^ &&
95 test_must_fail git rev-parse partial~2)
96
97 '
98
99 test_expect_success 'fast-export --reference-excluded-parents main~2..main' '
100
101 git fast-export --reference-excluded-parents main~2..main >actual &&
102 grep commit.refs/heads/main actual >commit-count &&
103 test_line_count = 2 commit-count &&
104 sed "s/main/rewrite/" actual |
105 (cd new &&
106 git fast-import &&
107 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
108 '
109
110 test_expect_success 'fast-export --show-original-ids' '
111
112 git fast-export --show-original-ids main >output &&
113 grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
114 git rev-list --objects main muss >objects-and-names &&
115 awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
116 comm -23 actual commits-trees-blobs >unfound &&
117 test_must_be_empty unfound
118 '
119
120 test_expect_success 'fast-export --show-original-ids | git fast-import' '
121
122 git fast-export --show-original-ids main muss | git fast-import --quiet &&
123 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
124 test $MUSS = $(git rev-parse --verify refs/tags/muss)
125 '
126
127 test_expect_success 'reencoding iso-8859-7' '
128
129 test_when_finished "git reset --hard HEAD~1" &&
130 test_config i18n.commitencoding iso-8859-7 &&
131 test_tick &&
132 echo rosten >file &&
133 git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
134 git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
135 sed "s/wer/i18n/" iso-8859-7.fi |
136 (cd new &&
137 git fast-import &&
138 # The commit object, if not re-encoded, would be 200 bytes plus hash.
139 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
140 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
141 # to \xCF\x80 (\317\200) in UTF-8 adds a byte. Check for
142 # the expected size.
143 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
144 # ...and for the expected translation of bytes.
145 git cat-file commit i18n >actual &&
146 grep $(printf "\317\200") actual &&
147 # Also make sure the commit does not have the "encoding" header
148 ! grep ^encoding actual)
149 '
150
151 test_expect_success 'aborting on iso-8859-7' '
152
153 test_when_finished "git reset --hard HEAD~1" &&
154 test_config i18n.commitencoding iso-8859-7 &&
155 echo rosten >file &&
156 git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
157 test_must_fail git fast-export --reencode=abort wer^..wer >iso-8859-7.fi
158 '
159
160 test_expect_success 'preserving iso-8859-7' '
161
162 test_when_finished "git reset --hard HEAD~1" &&
163 test_config i18n.commitencoding iso-8859-7 &&
164 echo rosten >file &&
165 git commit -s -F "$TEST_DIRECTORY/t9350/simple-iso-8859-7-commit-message.txt" file &&
166 git fast-export --reencode=no wer^..wer >iso-8859-7.fi &&
167 sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
168 (cd new &&
169 git fast-import &&
170 # The commit object, if not re-encoded, is 200 bytes plus hash.
171 # Removing the "encoding iso-8859-7\n" header would drops 20
172 # bytes. Re-encoding the Pi character from \xF0 (\360) in
173 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
174 # Check for the expected size...
175 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
176 # ...as well as the expected byte.
177 git cat-file commit i18n-no-recoding >actual &&
178 grep $(printf "\360") actual &&
179 # Also make sure the commit has the "encoding" header
180 grep ^encoding actual)
181 '
182
183 test_expect_success 'encoding preserved if reencoding fails' '
184
185 test_when_finished "git reset --hard HEAD~1" &&
186 test_config i18n.commitencoding iso-8859-7 &&
187 echo rosten >file &&
188 git commit -s -F "$TEST_DIRECTORY/t9350/broken-iso-8859-7-commit-message.txt" file &&
189 git fast-export --reencode=yes wer^..wer >iso-8859-7.fi &&
190 sed "s/wer/i18n-invalid/" iso-8859-7.fi |
191 (cd new &&
192 git fast-import &&
193 git cat-file commit i18n-invalid >actual &&
194 # Make sure the commit still has the encoding header
195 grep ^encoding actual &&
196 # Verify that the commit has the expected size; i.e.
197 # that no bytes were re-encoded to a different encoding.
198 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
199 # ...and check for the original special bytes
200 grep $(printf "\360") actual &&
201 grep $(printf "\377") actual)
202 '
203
204 test_expect_success 'import/export-marks' '
205
206 git checkout -b marks main &&
207 git fast-export --export-marks=tmp-marks HEAD &&
208 test -s tmp-marks &&
209 test_line_count = 3 tmp-marks &&
210 git fast-export --import-marks=tmp-marks \
211 --export-marks=tmp-marks HEAD >actual &&
212 test $(grep ^commit actual | wc -l) -eq 0 &&
213 echo change > file &&
214 git commit -m "last commit" file &&
215 git fast-export --import-marks=tmp-marks \
216 --export-marks=tmp-marks HEAD >actual &&
217 test $(grep ^commit\ actual | wc -l) -eq 1 &&
218 test_line_count = 4 tmp-marks
219
220 '
221
222 cat > signed-tag-import << EOF
223 tag sign-your-name
224 from $(git rev-parse HEAD)
225 tagger C O Mitter <committer@example.com> 1112911993 -0700
226 data 210
227 A message for a sign
228 -----BEGIN PGP SIGNATURE-----
229 Version: GnuPG v1.4.5 (GNU/Linux)
230
231 fakedsignaturefakedsignaturefakedsignaturefakedsignaturfakedsign
232 aturefakedsignaturefake=
233 =/59v
234 -----END PGP SIGNATURE-----
235 EOF
236
237 test_expect_success 'set up faked signed tag' '
238
239 cat signed-tag-import | git fast-import
240
241 '
242
243 test_expect_success 'signed-tags=abort' '
244
245 test_must_fail git fast-export --signed-tags=abort sign-your-name
246
247 '
248
249 test_expect_success 'signed-tags=verbatim' '
250
251 git fast-export --signed-tags=verbatim sign-your-name > output &&
252 grep PGP output
253
254 '
255
256 test_expect_success 'signed-tags=strip' '
257
258 git fast-export --signed-tags=strip sign-your-name > output &&
259 ! grep PGP output
260
261 '
262
263 test_expect_success 'signed-tags=warn-strip' '
264 git fast-export --signed-tags=warn-strip sign-your-name >output 2>err &&
265 ! grep PGP output &&
266 test -s err
267 '
268
269 test_expect_success 'setup submodule' '
270
271 test_config_global protocol.file.allow always &&
272 git checkout -f main &&
273 mkdir sub &&
274 (
275 cd sub &&
276 git init &&
277 echo test file > file &&
278 git add file &&
279 git commit -m sub_initial
280 ) &&
281 git submodule add "$(pwd)/sub" sub &&
282 git commit -m initial &&
283 test_tick &&
284 (
285 cd sub &&
286 echo more data >> file &&
287 git add file &&
288 git commit -m sub_second
289 ) &&
290 git add sub &&
291 git commit -m second
292
293 '
294
295 test_expect_success 'submodule fast-export | fast-import' '
296
297 test_config_global protocol.file.allow always &&
298 SUBENT1=$(git ls-tree main^ sub) &&
299 SUBENT2=$(git ls-tree main sub) &&
300 rm -rf new &&
301 mkdir new &&
302 git --git-dir=new/.git init &&
303 git fast-export --signed-tags=strip --all >actual &&
304 (cd new &&
305 git fast-import &&
306 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
307 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
308 git checkout main &&
309 git submodule init &&
310 git submodule update &&
311 cmp sub/file ../sub/file) <actual
312
313 '
314
315 GIT_AUTHOR_NAME='A U Thor'; export GIT_AUTHOR_NAME
316 GIT_COMMITTER_NAME='C O Mitter'; export GIT_COMMITTER_NAME
317
318 test_expect_success 'setup copies' '
319
320 git checkout -b copy rein &&
321 git mv file file3 &&
322 git commit -m move1 &&
323 test_tick &&
324 cp file2 file4 &&
325 git add file4 &&
326 git mv file2 file5 &&
327 git commit -m copy1 &&
328 test_tick &&
329 cp file3 file6 &&
330 git add file6 &&
331 git commit -m copy2 &&
332 test_tick &&
333 echo more text >> file6 &&
334 echo even more text >> file6 &&
335 git add file6 &&
336 git commit -m modify &&
337 test_tick &&
338 cp file6 file7 &&
339 echo test >> file7 &&
340 git add file7 &&
341 git commit -m copy_modify
342
343 '
344
345 test_expect_success 'fast-export -C -C | fast-import' '
346
347 ENTRY=$(git rev-parse --verify copy) &&
348 rm -rf new &&
349 mkdir new &&
350 git --git-dir=new/.git init &&
351 git fast-export -C -C --signed-tags=strip --all > output &&
352 grep "^C file2 file4\$" output &&
353 cat output |
354 (cd new &&
355 git fast-import &&
356 test $ENTRY = $(git rev-parse --verify refs/heads/copy))
357
358 '
359
360 test_expect_success 'fast-export | fast-import when main is tagged' '
361
362 git tag -m msg last &&
363 git fast-export -C -C --signed-tags=strip --all > output &&
364 test $(grep -c "^tag " output) = 3
365
366 '
367
368 cat > tag-content << EOF
369 object $(git rev-parse HEAD)
370 type commit
371 tag rosten
372 EOF
373
374 test_expect_success 'cope with tagger-less tags' '
375
376 TAG=$(git hash-object -t tag -w tag-content) &&
377 git update-ref refs/tags/sonnenschein $TAG &&
378 git fast-export -C -C --signed-tags=strip --all > output &&
379 test $(grep -c "^tag " output) = 4 &&
380 ! grep "Unspecified Tagger" output &&
381 git fast-export -C -C --signed-tags=strip --all \
382 --fake-missing-tagger > output &&
383 test $(grep -c "^tag " output) = 4 &&
384 grep "Unspecified Tagger" output
385
386 '
387
388 test_expect_success 'setup for limiting exports by PATH' '
389 mkdir limit-by-paths &&
390 (
391 cd limit-by-paths &&
392 git init &&
393 echo hi > there &&
394 git add there &&
395 git commit -m "First file" &&
396 echo foo > bar &&
397 git add bar &&
398 git commit -m "Second file" &&
399 git tag -a -m msg mytag &&
400 echo morefoo >> bar &&
401 git add bar &&
402 git commit -m "Change to second file"
403 )
404 '
405
406 cat > limit-by-paths/expected << EOF
407 blob
408 mark :1
409 data 3
410 hi
411
412 reset refs/tags/mytag
413 commit refs/tags/mytag
414 mark :2
415 author A U Thor <author@example.com> 1112912713 -0700
416 committer C O Mitter <committer@example.com> 1112912713 -0700
417 data 11
418 First file
419 M 100644 :1 there
420
421 EOF
422
423 test_expect_success 'dropping tag of filtered out object' '
424 (
425 cd limit-by-paths &&
426 git fast-export --tag-of-filtered-object=drop mytag -- there > output &&
427 test_cmp expected output
428 )
429 '
430
431 cat >> limit-by-paths/expected << EOF
432 tag mytag
433 from :2
434 tagger C O Mitter <committer@example.com> 1112912713 -0700
435 data 4
436 msg
437
438 EOF
439
440 test_expect_success 'rewriting tag of filtered out object' '
441 (
442 cd limit-by-paths &&
443 git fast-export --tag-of-filtered-object=rewrite mytag -- there > output &&
444 test_cmp expected output
445 )
446 '
447
448 test_expect_success 'rewrite tag predating pathspecs to nothing' '
449 test_create_repo rewrite_tag_predating_pathspecs &&
450 (
451 cd rewrite_tag_predating_pathspecs &&
452
453 test_commit initial &&
454
455 git tag -a -m "Some old tag" v0.0.0.0.0.0.1 &&
456
457 test_commit bar &&
458
459 git fast-export --tag-of-filtered-object=rewrite --all -- bar.t >output &&
460 grep from.$ZERO_OID output
461 )
462 '
463
464 cat > limit-by-paths/expected << EOF
465 blob
466 mark :1
467 data 4
468 foo
469
470 blob
471 mark :2
472 data 3
473 hi
474
475 reset refs/heads/main
476 commit refs/heads/main
477 mark :3
478 author A U Thor <author@example.com> 1112912713 -0700
479 committer C O Mitter <committer@example.com> 1112912713 -0700
480 data 12
481 Second file
482 M 100644 :1 bar
483 M 100644 :2 there
484
485 EOF
486
487 test_expect_failure 'no exact-ref revisions included' '
488 (
489 cd limit-by-paths &&
490 git fast-export main~2..main~1 > output &&
491 test_cmp expected output
492 )
493 '
494
495 test_expect_success 'path limiting with import-marks does not lose unmodified files' '
496 git checkout -b simple marks~2 &&
497 git fast-export --export-marks=marks simple -- file > /dev/null &&
498 echo more content >> file &&
499 test_tick &&
500 git commit -mnext file &&
501 git fast-export --import-marks=marks simple -- file file0 >actual &&
502 grep file0 actual
503 '
504
505 test_expect_success 'avoid corrupt stream with non-existent mark' '
506 test_create_repo avoid_non_existent_mark &&
507 (
508 cd avoid_non_existent_mark &&
509
510 test_commit important-path &&
511
512 test_commit ignored &&
513
514 git branch A &&
515 git branch B &&
516
517 echo foo >>important-path.t &&
518 git add important-path.t &&
519 test_commit more changes &&
520
521 git fast-export --all -- important-path.t | git fast-import --force
522 )
523 '
524
525 test_expect_success 'full-tree re-shows unmodified files' '
526 git checkout -f simple &&
527 git fast-export --full-tree simple >actual &&
528 test $(grep -c file0 actual) -eq 3
529 '
530
531 test_expect_success 'set-up a few more tags for tag export tests' '
532 git checkout -f main &&
533 HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
534 git tag tree_tag -m "tagging a tree" $HEAD_TREE &&
535 git tag -a tree_tag-obj -m "tagging a tree" $HEAD_TREE &&
536 git tag tag-obj_tag -m "tagging a tag" tree_tag-obj &&
537 git tag -a tag-obj_tag-obj -m "tagging a tag" tree_tag-obj
538 '
539
540 test_expect_success 'tree_tag' '
541 mkdir result &&
542 (cd result && git init) &&
543 git fast-export tree_tag > fe-stream &&
544 (cd result && git fast-import < ../fe-stream)
545 '
546
547 # NEEDSWORK: not just check return status, but validate the output
548 # Note that these tests DO NOTHING other than print a warning that
549 # they are omitting the one tag we asked them to export (because the
550 # tags resolve to a tree). They exist just to make sure we do not
551 # abort but instead just warn.
552 test_expect_success 'tree_tag-obj' 'git fast-export tree_tag-obj'
553 test_expect_success 'tag-obj_tag' 'git fast-export tag-obj_tag'
554 test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
555
556 test_expect_success 'handling tags of blobs' '
557 git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
558 git fast-export blobtag >actual &&
559 cat >expect <<-EOF &&
560 blob
561 mark :1
562 data 9
563 die Luft
564
565 tag blobtag
566 from :1
567 tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
568 data 14
569 Tag of a blob
570
571 EOF
572 test_cmp expect actual
573 '
574
575 test_expect_success 'handling nested tags' '
576 git tag -a -m "This is a nested tag" nested muss &&
577 git fast-export --mark-tags nested >output &&
578 grep "^from $ZERO_OID$" output &&
579 grep "^tag nested$" output >tag_lines &&
580 test_line_count = 2 tag_lines
581 '
582
583 test_expect_success 'directory becomes symlink' '
584 git init dirtosymlink &&
585 git init result &&
586 (
587 cd dirtosymlink &&
588 mkdir foo &&
589 mkdir bar &&
590 echo hello > foo/world &&
591 echo hello > bar/world &&
592 git add foo/world bar/world &&
593 git commit -q -mone &&
594 git rm -r foo &&
595 test_ln_s_add bar foo &&
596 git commit -q -mtwo
597 ) &&
598 (
599 cd dirtosymlink &&
600 git fast-export main -- foo |
601 (cd ../result && git fast-import --quiet)
602 ) &&
603 (cd result && git show main:foo)
604 '
605
606 test_expect_success 'fast-export quotes pathnames' '
607 git init crazy-paths &&
608 test_config -C crazy-paths core.protectNTFS false &&
609 (cd crazy-paths &&
610 blob=$(echo foo | git hash-object -w --stdin) &&
611 git -c core.protectNTFS=false update-index --add \
612 --cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
613 --cacheinfo 100644 $blob "path with \"quote\"" \
614 --cacheinfo 100644 $blob "path with \\backslash" \
615 --cacheinfo 100644 $blob "path with space" &&
616 git commit -m addition &&
617 git ls-files -z -s | perl -0pe "s{\\t}{$&subdir/}" >index &&
618 git read-tree --empty &&
619 git update-index -z --index-info <index &&
620 git commit -m rename &&
621 git read-tree --empty &&
622 git commit -m deletion &&
623 git fast-export -M HEAD >export.out &&
624 git rev-list HEAD >expect &&
625 git init result &&
626 cd result &&
627 git fast-import <../export.out &&
628 git rev-list HEAD >actual &&
629 test_cmp ../expect actual
630 )
631 '
632
633 test_expect_success 'test bidirectionality' '
634 git init marks-test &&
635 git fast-export --export-marks=marks-cur --import-marks-if-exists=marks-cur --branches | \
636 git --git-dir=marks-test/.git fast-import --export-marks=marks-new --import-marks-if-exists=marks-new &&
637 (cd marks-test &&
638 git reset --hard &&
639 echo Wohlauf > file &&
640 git commit -a -m "back in time") &&
641 git --git-dir=marks-test/.git fast-export --export-marks=marks-new --import-marks-if-exists=marks-new --branches | \
642 git fast-import --export-marks=marks-cur --import-marks-if-exists=marks-cur
643 '
644
645 cat > expected << EOF
646 blob
647 mark :13
648 data 5
649 bump
650
651 commit refs/heads/main
652 mark :14
653 author A U Thor <author@example.com> 1112912773 -0700
654 committer C O Mitter <committer@example.com> 1112912773 -0700
655 data 5
656 bump
657 from :12
658 M 100644 :13 file
659
660 EOF
661
662 test_expect_success 'avoid uninteresting refs' '
663 > tmp-marks &&
664 git fast-export --import-marks=tmp-marks \
665 --export-marks=tmp-marks main > /dev/null &&
666 git tag v1.0 &&
667 git branch uninteresting &&
668 echo bump > file &&
669 git commit -a -m bump &&
670 git fast-export --import-marks=tmp-marks \
671 --export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
672 test_cmp expected actual
673 '
674
675 cat > expected << EOF
676 reset refs/heads/main
677 from :14
678
679 EOF
680
681 test_expect_success 'refs are updated even if no commits need to be exported' '
682 > tmp-marks &&
683 git fast-export --import-marks=tmp-marks \
684 --export-marks=tmp-marks main > /dev/null &&
685 git fast-export --import-marks=tmp-marks \
686 --export-marks=tmp-marks main > actual &&
687 test_cmp expected actual
688 '
689
690 test_expect_success 'use refspec' '
691 git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
692 grep "^commit " actual2 | sort | uniq >actual &&
693 echo "commit refs/heads/foobar" > expected &&
694 test_cmp expected actual
695 '
696
697 test_expect_success 'delete ref because entire history excluded' '
698 git branch to-delete &&
699 git fast-export to-delete ^to-delete >actual &&
700 cat >expected <<-EOF &&
701 reset refs/heads/to-delete
702 from $ZERO_OID
703
704 EOF
705 test_cmp expected actual
706 '
707
708 test_expect_success 'delete refspec' '
709 git fast-export --refspec :refs/heads/to-delete >actual &&
710 cat >expected <<-EOF &&
711 reset refs/heads/to-delete
712 from $ZERO_OID
713
714 EOF
715 test_cmp expected actual
716 '
717
718 test_expect_success 'when using -C, do not declare copy when source of copy is also modified' '
719 test_create_repo src &&
720 echo a_line >src/file.txt &&
721 git -C src add file.txt &&
722 git -C src commit -m 1st_commit &&
723
724 cp src/file.txt src/file2.txt &&
725 echo another_line >>src/file.txt &&
726 git -C src add file.txt file2.txt &&
727 git -C src commit -m 2nd_commit &&
728
729 test_create_repo dst &&
730 git -C src fast-export --all -C >actual &&
731 git -C dst fast-import <actual &&
732 git -C src show >expected &&
733 git -C dst show >actual &&
734 test_cmp expected actual
735 '
736
737 test_expect_success 'merge commit gets exported with --import-marks' '
738 test_create_repo merging &&
739 (
740 cd merging &&
741 test_commit initial &&
742 git checkout -b topic &&
743 test_commit on-topic &&
744 git checkout main &&
745 test_commit on-main &&
746 test_tick &&
747 git merge --no-ff -m Yeah topic &&
748
749 echo ":1 $(git rev-parse HEAD^^)" >marks &&
750 git fast-export --import-marks=marks main >out &&
751 grep Yeah out
752 )
753 '
754
755
756 test_expect_success 'fast-export --first-parent outputs all revisions output by revision walk' '
757 git init first-parent &&
758 (
759 cd first-parent &&
760 test_commit A &&
761 git checkout -b topic1 &&
762 test_commit B &&
763 git checkout main &&
764 git merge --no-ff topic1 &&
765
766 git checkout -b topic2 &&
767 test_commit C &&
768 git checkout main &&
769 git merge --no-ff topic2 &&
770
771 test_commit D &&
772
773 git fast-export main -- --first-parent >first-parent-export &&
774 git fast-export main -- --first-parent --reverse >first-parent-reverse-export &&
775 test_cmp first-parent-export first-parent-reverse-export &&
776
777 git init import &&
778 git -C import fast-import <first-parent-export &&
779
780 git log --format="%ad %s" --first-parent main >expected &&
781 git -C import log --format="%ad %s" --all >actual &&
782 test_cmp expected actual &&
783 test_line_count = 4 actual
784 )
785 '
786
787 test_done