]> git.ipfire.org Git - thirdparty/git.git/blob - t/t9300-fast-import.sh
projects / thirdparty / git.git / blob
? search:


1ba20c1f1a2577954bf033f2e334d5890be3399f
[thirdparty/git.git] / t / t9300-fast-import.sh
1 #!/bin/sh
2 #
3 # Copyright (c) 2007 Shawn Pearce
4 #
5
6 test_description='test git fast-import utility'
7 . ./test-lib.sh
8 . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
9
10 verify_packs () {
11 for p in .git/objects/pack/*.pack
12 do
13 git verify-pack "$@" "$p" || return
14 done
15 }
16
17 file2_data='file2
18 second line of EOF'
19
20 file3_data='EOF
21 in 3rd file
22 END'
23
24 file4_data=abcd
25 file4_len=4
26
27 file5_data='an inline file.
28 we should see it later.'
29
30 file6_data='#!/bin/sh
31 echo "$@"'
32
33 ###
34 ### series A
35 ###
36
37 test_expect_success 'empty stream succeeds' '
38 git config fastimport.unpackLimit 0 &&
39 git fast-import </dev/null
40 '
41
42 test_expect_success 'truncated stream complains' '
43 echo "tag foo" | test_must_fail git fast-import
44 '
45
46 test_expect_success 'A: create pack from stdin' '
47 test_tick &&
48 cat >input <<-INPUT_END &&
49 blob
50 mark :2
51 data <<EOF
52 $file2_data
53 EOF
54
55 blob
56 mark :3
57 data <<END
58 $file3_data
59 END
60
61 blob
62 mark :4
63 data $file4_len
64 $file4_data
65 commit refs/heads/master
66 mark :5
67 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
68 data <<COMMIT
69 initial
70 COMMIT
71
72 M 644 :2 file2
73 M 644 :3 file3
74 M 755 :4 file4
75
76 tag series-A
77 from :5
78 data <<EOF
79 An annotated tag without a tagger
80 EOF
81
82 tag series-A-blob
83 from :3
84 data <<EOF
85 An annotated tag that annotates a blob.
86 EOF
87
88 INPUT_END
89 git fast-import --export-marks=marks.out <input &&
90 git whatchanged master
91 '
92
93 test_expect_success 'A: verify pack' '
94 verify_packs
95 '
96
97 test_expect_success 'A: verify commit' '
98 cat >expect <<-EOF &&
99 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
100 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
101
102 initial
103 EOF
104 git cat-file commit master | sed 1d >actual &&
105 test_cmp expect actual
106 '
107
108 test_expect_success 'A: verify tree' '
109 cat >expect <<-EOF &&
110 100644 blob file2
111 100644 blob file3
112 100755 blob file4
113 EOF
114 git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
115 test_cmp expect actual
116 '
117
118 test_expect_success 'A: verify file2' '
119 echo "$file2_data" >expect &&
120 git cat-file blob master:file2 >actual &&
121 test_cmp expect actual
122 '
123
124 test_expect_success 'A: verify file3' '
125 echo "$file3_data" >expect &&
126 git cat-file blob master:file3 >actual &&
127 test_cmp expect actual
128 '
129
130 test_expect_success 'A: verify file4' '
131 printf "$file4_data" >expect &&
132 git cat-file blob master:file4 >actual &&
133 test_cmp expect actual
134 '
135
136 test_expect_success 'A: verify tag/series-A' '
137 cat >expect <<-EOF &&
138 object $(git rev-parse refs/heads/master)
139 type commit
140 tag series-A
141
142 An annotated tag without a tagger
143 EOF
144 git cat-file tag tags/series-A >actual &&
145 test_cmp expect actual
146 '
147
148 test_expect_success 'A: verify tag/series-A-blob' '
149 cat >expect <<-EOF &&
150 object $(git rev-parse refs/heads/master:file3)
151 type blob
152 tag series-A-blob
153
154 An annotated tag that annotates a blob.
155 EOF
156 git cat-file tag tags/series-A-blob >actual &&
157 test_cmp expect actual
158 '
159
160 test_expect_success 'A: verify marks output' '
161 cat >expect <<-EOF &&
162 :2 $(git rev-parse --verify master:file2)
163 :3 $(git rev-parse --verify master:file3)
164 :4 $(git rev-parse --verify master:file4)
165 :5 $(git rev-parse --verify master^0)
166 EOF
167 test_cmp expect marks.out
168 '
169
170 test_expect_success 'A: verify marks import' '
171 git fast-import \
172 --import-marks=marks.out \
173 --export-marks=marks.new \
174 </dev/null &&
175 test_cmp expect marks.new
176 '
177
178 test_expect_success 'A: tag blob by sha1' '
179 test_tick &&
180 new_blob=$(echo testing | git hash-object --stdin) &&
181 cat >input <<-INPUT_END &&
182 tag series-A-blob-2
183 from $(git rev-parse refs/heads/master:file3)
184 data <<EOF
185 Tag blob by sha1.
186 EOF
187
188 blob
189 mark :6
190 data <<EOF
191 testing
192 EOF
193
194 commit refs/heads/new_blob
195 committer <> 0 +0000
196 data 0
197 M 644 :6 new_blob
198 #pretend we got sha1 from fast-import
199 ls "new_blob"
200
201 tag series-A-blob-3
202 from $new_blob
203 data <<EOF
204 Tag new_blob.
205 EOF
206 INPUT_END
207
208 cat >expect <<-EOF &&
209 object $(git rev-parse refs/heads/master:file3)
210 type blob
211 tag series-A-blob-2
212
213 Tag blob by sha1.
214 object $new_blob
215 type blob
216 tag series-A-blob-3
217
218 Tag new_blob.
219 EOF
220
221 git fast-import <input &&
222 git cat-file tag tags/series-A-blob-2 >actual &&
223 git cat-file tag tags/series-A-blob-3 >>actual &&
224 test_cmp expect actual
225 '
226
227 test_expect_success 'A: verify marks import does not crash' '
228 test_tick &&
229 cat >input <<-INPUT_END &&
230 commit refs/heads/verify--import-marks
231 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
232 data <<COMMIT
233 recreate from :5
234 COMMIT
235
236 from :5
237 M 755 :2 copy-of-file2
238
239 INPUT_END
240
241 git fast-import --import-marks=marks.out <input &&
242 git whatchanged verify--import-marks
243 '
244
245 test_expect_success 'A: verify pack' '
246 verify_packs
247 '
248
249 test_expect_success 'A: verify diff' '
250 cat >expect <<-EOF &&
251 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
252 EOF
253 git diff-tree -M -r master verify--import-marks >actual &&
254 compare_diff_raw expect actual &&
255 test $(git rev-parse --verify master:file2) \
256 = $(git rev-parse --verify verify--import-marks:copy-of-file2)
257 '
258
259 test_expect_success 'A: export marks with large values' '
260 test_tick &&
261 mt=$(git hash-object --stdin < /dev/null) &&
262 >input.blob &&
263 >marks.exp &&
264 >tree.exp &&
265
266 cat >input.commit <<-EOF &&
267 commit refs/heads/verify--dump-marks
268 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
269 data <<COMMIT
270 test the sparse array dumping routines with exponentially growing marks
271 COMMIT
272 EOF
273
274 i=0 l=4 m=6 n=7 &&
275 while test "$i" -lt 27
276 do
277 cat >>input.blob <<-EOF &&
278 blob
279 mark :$l
280 data 0
281 blob
282 mark :$m
283 data 0
284 blob
285 mark :$n
286 data 0
287 EOF
288 echo "M 100644 :$l l$i" >>input.commit &&
289 echo "M 100644 :$m m$i" >>input.commit &&
290 echo "M 100644 :$n n$i" >>input.commit &&
291
292 echo ":$l $mt" >>marks.exp &&
293 echo ":$m $mt" >>marks.exp &&
294 echo ":$n $mt" >>marks.exp &&
295
296 printf "100644 blob $mt\tl$i\n" >>tree.exp &&
297 printf "100644 blob $mt\tm$i\n" >>tree.exp &&
298 printf "100644 blob $mt\tn$i\n" >>tree.exp &&
299
300 l=$(($l + $l)) &&
301 m=$(($m + $m)) &&
302 n=$(($l + $n)) &&
303
304 i=$((1 + $i)) || return 1
305 done &&
306
307 sort tree.exp > tree.exp_s &&
308
309 cat input.blob input.commit | git fast-import --export-marks=marks.large &&
310 git ls-tree refs/heads/verify--dump-marks >tree.out &&
311 test_cmp tree.exp_s tree.out &&
312 test_cmp marks.exp marks.large
313 '
314
315 ###
316 ### series B
317 ###
318
319 test_expect_success 'B: fail on invalid blob sha1' '
320 test_tick &&
321 cat >input <<-INPUT_END &&
322 commit refs/heads/branch
323 mark :1
324 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
325 data <<COMMIT
326 corrupt
327 COMMIT
328
329 from refs/heads/master
330 M 755 0000000000000000000000000000000000000001 zero1
331
332 INPUT_END
333
334 test_when_finished "rm -f .git/objects/pack_* .git/objects/index_*" &&
335 test_must_fail git fast-import <input
336 '
337
338 test_expect_success 'B: accept branch name "TEMP_TAG"' '
339 cat >input <<-INPUT_END &&
340 commit TEMP_TAG
341 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
342 data <<COMMIT
343 tag base
344 COMMIT
345
346 from refs/heads/master
347
348 INPUT_END
349
350 test_when_finished "rm -f .git/TEMP_TAG
351 git gc
352 git prune" &&
353 git fast-import <input &&
354 test -f .git/TEMP_TAG &&
355 test $(git rev-parse master) = $(git rev-parse TEMP_TAG^)
356 '
357
358 test_expect_success 'B: accept empty committer' '
359 cat >input <<-INPUT_END &&
360 commit refs/heads/empty-committer-1
361 committer <> $GIT_COMMITTER_DATE
362 data <<COMMIT
363 empty commit
364 COMMIT
365 INPUT_END
366
367 test_when_finished "git update-ref -d refs/heads/empty-committer-1
368 git gc
369 git prune" &&
370 git fast-import <input &&
371 out=$(git fsck) &&
372 echo "$out" &&
373 test -z "$out"
374 '
375
376 test_expect_success 'B: accept and fixup committer with no name' '
377 cat >input <<-INPUT_END &&
378 commit refs/heads/empty-committer-2
379 committer <a@b.com> $GIT_COMMITTER_DATE
380 data <<COMMIT
381 empty commit
382 COMMIT
383 INPUT_END
384
385 test_when_finished "git update-ref -d refs/heads/empty-committer-2
386 git gc
387 git prune" &&
388 git fast-import <input &&
389 out=$(git fsck) &&
390 echo "$out" &&
391 test -z "$out"
392 '
393
394 test_expect_success 'B: fail on invalid committer (1)' '
395 cat >input <<-INPUT_END &&
396 commit refs/heads/invalid-committer
397 committer Name email> $GIT_COMMITTER_DATE
398 data <<COMMIT
399 empty commit
400 COMMIT
401 INPUT_END
402
403 test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
404 test_must_fail git fast-import <input
405 '
406
407 test_expect_success 'B: fail on invalid committer (2)' '
408 cat >input <<-INPUT_END &&
409 commit refs/heads/invalid-committer
410 committer Name <e<mail> $GIT_COMMITTER_DATE
411 data <<COMMIT
412 empty commit
413 COMMIT
414 INPUT_END
415
416 test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
417 test_must_fail git fast-import <input
418 '
419
420 test_expect_success 'B: fail on invalid committer (3)' '
421 cat >input <<-INPUT_END &&
422 commit refs/heads/invalid-committer
423 committer Name <email>> $GIT_COMMITTER_DATE
424 data <<COMMIT
425 empty commit
426 COMMIT
427 INPUT_END
428
429 test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
430 test_must_fail git fast-import <input
431 '
432
433 test_expect_success 'B: fail on invalid committer (4)' '
434 cat >input <<-INPUT_END &&
435 commit refs/heads/invalid-committer
436 committer Name <email $GIT_COMMITTER_DATE
437 data <<COMMIT
438 empty commit
439 COMMIT
440 INPUT_END
441
442 test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
443 test_must_fail git fast-import <input
444 '
445
446 test_expect_success 'B: fail on invalid committer (5)' '
447 cat >input <<-INPUT_END &&
448 commit refs/heads/invalid-committer
449 committer Name<email> $GIT_COMMITTER_DATE
450 data <<COMMIT
451 empty commit
452 COMMIT
453 INPUT_END
454
455 test_when_finished "git update-ref -d refs/heads/invalid-committer" &&
456 test_must_fail git fast-import <input
457 '
458
459 ###
460 ### series C
461 ###
462
463 test_expect_success 'C: incremental import create pack from stdin' '
464 newf=$(echo hi newf | git hash-object -w --stdin) &&
465 oldf=$(git rev-parse --verify master:file2) &&
466 test_tick &&
467 cat >input <<-INPUT_END &&
468 commit refs/heads/branch
469 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
470 data <<COMMIT
471 second
472 COMMIT
473
474 from refs/heads/master
475 M 644 $oldf file2/oldf
476 M 755 $newf file2/newf
477 D file3
478
479 INPUT_END
480
481 git fast-import <input &&
482 git whatchanged branch
483 '
484
485 test_expect_success 'C: verify pack' '
486 verify_packs
487 '
488
489 test_expect_success 'C: validate reuse existing blob' '
490 test $newf = $(git rev-parse --verify branch:file2/newf) &&
491 test $oldf = $(git rev-parse --verify branch:file2/oldf)
492 '
493
494 test_expect_success 'C: verify commit' '
495 cat >expect <<-EOF &&
496 parent $(git rev-parse --verify master^0)
497 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
498 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
499
500 second
501 EOF
502
503 git cat-file commit branch | sed 1d >actual &&
504 test_cmp expect actual
505 '
506
507 test_expect_success 'C: validate rename result' '
508 cat >expect <<-EOF &&
509 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
510 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
511 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
512 EOF
513 git diff-tree -M -r master branch >actual &&
514 compare_diff_raw expect actual
515 '
516
517 ###
518 ### series D
519 ###
520
521 test_expect_success 'D: inline data in commit' '
522 test_tick &&
523 cat >input <<-INPUT_END &&
524 commit refs/heads/branch
525 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
526 data <<COMMIT
527 third
528 COMMIT
529
530 from refs/heads/branch^0
531 M 644 inline newdir/interesting
532 data <<EOF
533 $file5_data
534 EOF
535
536 M 755 inline newdir/exec.sh
537 data <<EOF
538 $file6_data
539 EOF
540
541 INPUT_END
542
543 git fast-import <input &&
544 git whatchanged branch
545 '
546
547 test_expect_success 'D: verify pack' '
548 verify_packs
549 '
550
551 test_expect_success 'D: validate new files added' '
552 cat >expect <<-EOF &&
553 :000000 100755 0000000000000000000000000000000000000000 e74b7d465e52746be2b4bae983670711e6e66657 A newdir/exec.sh
554 :000000 100644 0000000000000000000000000000000000000000 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 A newdir/interesting
555 EOF
556 git diff-tree -M -r branch^ branch >actual &&
557 compare_diff_raw expect actual
558 '
559
560 test_expect_success 'D: verify file5' '
561 echo "$file5_data" >expect &&
562 git cat-file blob branch:newdir/interesting >actual &&
563 test_cmp expect actual
564 '
565
566 test_expect_success 'D: verify file6' '
567 echo "$file6_data" >expect &&
568 git cat-file blob branch:newdir/exec.sh >actual &&
569 test_cmp expect actual
570 '
571
572 ###
573 ### series E
574 ###
575
576 test_expect_success 'E: rfc2822 date, --date-format=raw' '
577 cat >input <<-INPUT_END &&
578 commit refs/heads/branch
579 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
580 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
581 data <<COMMIT
582 RFC 2822 type date
583 COMMIT
584
585 from refs/heads/branch^0
586
587 INPUT_END
588
589 test_must_fail git fast-import --date-format=raw <input
590 '
591 test_expect_success 'E: rfc2822 date, --date-format=rfc2822' '
592 git fast-import --date-format=rfc2822 <input
593 '
594
595 test_expect_success 'E: verify pack' '
596 verify_packs
597 '
598
599 test_expect_success 'E: verify commit' '
600 cat >expect <<-EOF &&
601 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
602 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
603
604 RFC 2822 type date
605 EOF
606 git cat-file commit branch | sed 1,2d >actual &&
607 test_cmp expect actual
608 '
609
610 ###
611 ### series F
612 ###
613
614 test_expect_success 'F: non-fast-forward update skips' '
615 old_branch=$(git rev-parse --verify branch^0) &&
616 test_tick &&
617 cat >input <<-INPUT_END &&
618 commit refs/heads/branch
619 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
620 data <<COMMIT
621 losing things already?
622 COMMIT
623
624 from refs/heads/branch~1
625
626 reset refs/heads/other
627 from refs/heads/branch
628
629 INPUT_END
630
631 test_must_fail git fast-import <input &&
632 # branch must remain unaffected
633 test $old_branch = $(git rev-parse --verify branch^0)
634 '
635
636 test_expect_success 'F: verify pack' '
637 verify_packs
638 '
639
640 test_expect_success 'F: verify other commit' '
641 cat >expect <<-EOF &&
642 tree $(git rev-parse branch~1^{tree})
643 parent $(git rev-parse branch~1)
644 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
645 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
646
647 losing things already?
648 EOF
649 git cat-file commit other >actual &&
650 test_cmp expect actual
651 '
652
653 ###
654 ### series G
655 ###
656
657 test_expect_success 'G: non-fast-forward update forced' '
658 old_branch=$(git rev-parse --verify branch^0) &&
659 test_tick &&
660 cat >input <<-INPUT_END &&
661 commit refs/heads/branch
662 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
663 data <<COMMIT
664 losing things already?
665 COMMIT
666
667 from refs/heads/branch~1
668
669 INPUT_END
670 git fast-import --force <input
671 '
672
673 test_expect_success 'G: verify pack' '
674 verify_packs
675 '
676
677 test_expect_success 'G: branch changed, but logged' '
678 test $old_branch != $(git rev-parse --verify branch^0) &&
679 test $old_branch = $(git rev-parse --verify branch@{1})
680 '
681
682 ###
683 ### series H
684 ###
685
686 test_expect_success 'H: deletall, add 1' '
687 test_tick &&
688 cat >input <<-INPUT_END &&
689 commit refs/heads/H
690 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
691 data <<COMMIT
692 third
693 COMMIT
694
695 from refs/heads/branch^0
696 M 644 inline i-will-die
697 data <<EOF
698 this file will never exist.
699 EOF
700
701 deleteall
702 M 644 inline h/e/l/lo
703 data <<EOF
704 $file5_data
705 EOF
706
707 INPUT_END
708 git fast-import <input &&
709 git whatchanged H
710 '
711
712 test_expect_success 'H: verify pack' '
713 verify_packs
714 '
715
716 test_expect_success 'H: validate old files removed, new files added' '
717 cat >expect <<-EOF &&
718 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
719 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
720 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
721 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
722 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
723 EOF
724 git diff-tree -M -r H^ H >actual &&
725 compare_diff_raw expect actual
726 '
727
728 test_expect_success 'H: verify file' '
729 echo "$file5_data" >expect &&
730 git cat-file blob H:h/e/l/lo >actual &&
731 test_cmp expect actual
732 '
733
734 ###
735 ### series I
736 ###
737
738 test_expect_success 'I: export-pack-edges' '
739 cat >input <<-INPUT_END &&
740 commit refs/heads/export-boundary
741 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
742 data <<COMMIT
743 we have a border. its only 40 characters wide.
744 COMMIT
745
746 from refs/heads/branch
747
748 INPUT_END
749 git fast-import --export-pack-edges=edges.list <input
750 '
751
752 test_expect_success 'I: verify edge list' '
753 cat >expect <<-EOF &&
754 .git/objects/pack/pack-.pack: $(git rev-parse --verify export-boundary)
755 EOF
756 sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
757 test_cmp expect actual
758 '
759
760 ###
761 ### series J
762 ###
763
764 test_expect_success 'J: reset existing branch creates empty commit' '
765 cat >input <<-INPUT_END &&
766 commit refs/heads/J
767 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
768 data <<COMMIT
769 create J
770 COMMIT
771
772 from refs/heads/branch
773
774 reset refs/heads/J
775
776 commit refs/heads/J
777 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
778 data <<COMMIT
779 initialize J
780 COMMIT
781
782 INPUT_END
783 git fast-import <input
784 '
785 test_expect_success 'J: branch has 1 commit, empty tree' '
786 test 1 = $(git rev-list J | wc -l) &&
787 test 0 = $(git ls-tree J | wc -l)
788 '
789
790 test_expect_success 'J: tag must fail on empty branch' '
791 cat >input <<-INPUT_END &&
792 reset refs/heads/J2
793
794 tag wrong_tag
795 from refs/heads/J2
796 data <<EOF
797 Tag branch that was reset.
798 EOF
799 INPUT_END
800 test_must_fail git fast-import <input
801 '
802
803 ###
804 ### series K
805 ###
806
807 test_expect_success 'K: reinit branch with from' '
808 cat >input <<-INPUT_END &&
809 commit refs/heads/K
810 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
811 data <<COMMIT
812 create K
813 COMMIT
814
815 from refs/heads/branch
816
817 commit refs/heads/K
818 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
819 data <<COMMIT
820 redo K
821 COMMIT
822
823 from refs/heads/branch^1
824
825 INPUT_END
826 git fast-import <input
827 '
828 test_expect_success 'K: verify K^1 = branch^1' '
829 test $(git rev-parse --verify branch^1) \
830 = $(git rev-parse --verify K^1)
831 '
832
833 ###
834 ### series L
835 ###
836
837 test_expect_success 'L: verify internal tree sorting' '
838 cat >input <<-INPUT_END &&
839 blob
840 mark :1
841 data <<EOF
842 some data
843 EOF
844
845 blob
846 mark :2
847 data <<EOF
848 other data
849 EOF
850
851 commit refs/heads/L
852 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
853 data <<COMMIT
854 create L
855 COMMIT
856
857 M 644 :1 b.
858 M 644 :1 b/other
859 M 644 :1 ba
860
861 commit refs/heads/L
862 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
863 data <<COMMIT
864 update L
865 COMMIT
866
867 M 644 :2 b.
868 M 644 :2 b/other
869 M 644 :2 ba
870 INPUT_END
871
872 cat >expect <<-EXPECT_END &&
873 :100644 100644 4268632... 55d3a52... M b.
874 :040000 040000 0ae5cac... 443c768... M b
875 :100644 100644 4268632... 55d3a52... M ba
876 EXPECT_END
877
878 git fast-import <input &&
879 git diff-tree --abbrev --raw L^ L >output &&
880 test_cmp expect output
881 '
882
883 test_expect_success 'L: nested tree copy does not corrupt deltas' '
884 cat >input <<-INPUT_END &&
885 blob
886 mark :1
887 data <<EOF
888 the data
889 EOF
890
891 commit refs/heads/L2
892 committer C O Mitter <committer@example.com> 1112912473 -0700
893 data <<COMMIT
894 init L2
895 COMMIT
896 M 644 :1 a/b/c
897 M 644 :1 a/b/d
898 M 644 :1 a/e/f
899
900 commit refs/heads/L2
901 committer C O Mitter <committer@example.com> 1112912473 -0700
902 data <<COMMIT
903 update L2
904 COMMIT
905 C a g
906 C a/e g/b
907 M 644 :1 g/b/h
908 INPUT_END
909
910 cat >expect <<-\EOF &&
911 g/b/f
912 g/b/h
913 EOF
914
915 test_when_finished "git update-ref -d refs/heads/L2" &&
916 git fast-import <input &&
917 git ls-tree L2 g/b/ >tmp &&
918 cat tmp | cut -f 2 >actual &&
919 test_cmp expect actual &&
920 git fsck $(git rev-parse L2)
921 '
922
923 ###
924 ### series M
925 ###
926
927 test_expect_success 'M: rename file in same subdirectory' '
928 test_tick &&
929 cat >input <<-INPUT_END &&
930 commit refs/heads/M1
931 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
932 data <<COMMIT
933 file rename
934 COMMIT
935
936 from refs/heads/branch^0
937 R file2/newf file2/n.e.w.f
938
939 INPUT_END
940
941 cat >expect <<-EOF &&
942 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
943 EOF
944 git fast-import <input &&
945 git diff-tree -M -r M1^ M1 >actual &&
946 compare_diff_raw expect actual
947 '
948
949 test_expect_success 'M: rename file to new subdirectory' '
950 cat >input <<-INPUT_END &&
951 commit refs/heads/M2
952 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
953 data <<COMMIT
954 file rename
955 COMMIT
956
957 from refs/heads/branch^0
958 R file2/newf i/am/new/to/you
959
960 INPUT_END
961
962 cat >expect <<-EOF &&
963 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
964 EOF
965 git fast-import <input &&
966 git diff-tree -M -r M2^ M2 >actual &&
967 compare_diff_raw expect actual
968 '
969
970 test_expect_success 'M: rename subdirectory to new subdirectory' '
971 cat >input <<-INPUT_END &&
972 commit refs/heads/M3
973 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
974 data <<COMMIT
975 file rename
976 COMMIT
977
978 from refs/heads/M2^0
979 R i other/sub
980
981 INPUT_END
982
983 cat >expect <<-EOF &&
984 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
985 EOF
986 git fast-import <input &&
987 git diff-tree -M -r M3^ M3 >actual &&
988 compare_diff_raw expect actual
989 '
990
991 test_expect_success 'M: rename root to subdirectory' '
992 cat >input <<-INPUT_END &&
993 commit refs/heads/M4
994 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
995 data <<COMMIT
996 rename root
997 COMMIT
998
999 from refs/heads/M2^0
1000 R "" sub
1001
1002 INPUT_END
1003
1004 cat >expect <<-EOF &&
1005 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2/oldf sub/file2/oldf
1006 :100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 R100 file4 sub/file4
1007 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you sub/i/am/new/to/you
1008 :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 R100 newdir/exec.sh sub/newdir/exec.sh
1009 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting sub/newdir/interesting
1010 EOF
1011 git fast-import <input &&
1012 git diff-tree -M -r M4^ M4 >actual &&
1013 cat actual &&
1014 compare_diff_raw expect actual
1015 '
1016
1017 ###
1018 ### series N
1019 ###
1020
1021 test_expect_success 'N: copy file in same subdirectory' '
1022 test_tick &&
1023 cat >input <<-INPUT_END &&
1024 commit refs/heads/N1
1025 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1026 data <<COMMIT
1027 file copy
1028 COMMIT
1029
1030 from refs/heads/branch^0
1031 C file2/newf file2/n.e.w.f
1032
1033 INPUT_END
1034
1035 cat >expect <<-EOF &&
1036 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
1037 EOF
1038 git fast-import <input &&
1039 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
1040 compare_diff_raw expect actual
1041 '
1042
1043 test_expect_success 'N: copy then modify subdirectory' '
1044 cat >input <<-INPUT_END &&
1045 commit refs/heads/N2
1046 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1047 data <<COMMIT
1048 clean directory copy
1049 COMMIT
1050
1051 from refs/heads/branch^0
1052 C file2 file3
1053
1054 commit refs/heads/N2
1055 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1056 data <<COMMIT
1057 modify directory copy
1058 COMMIT
1059
1060 M 644 inline file3/file5
1061 data <<EOF
1062 $file5_data
1063 EOF
1064
1065 INPUT_END
1066
1067 cat >expect <<-EOF &&
1068 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
1069 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1070 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1071 EOF
1072 git fast-import <input &&
1073 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
1074 compare_diff_raw expect actual
1075 '
1076
1077 test_expect_success 'N: copy dirty subdirectory' '
1078 cat >input <<-INPUT_END &&
1079 commit refs/heads/N3
1080 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1081 data <<COMMIT
1082 dirty directory copy
1083 COMMIT
1084
1085 from refs/heads/branch^0
1086 M 644 inline file2/file5
1087 data <<EOF
1088 $file5_data
1089 EOF
1090
1091 C file2 file3
1092 D file2/file5
1093
1094 INPUT_END
1095
1096 git fast-import <input &&
1097 test $(git rev-parse N2^{tree}) = $(git rev-parse N3^{tree})
1098 '
1099
1100 test_expect_success 'N: copy directory by id' '
1101 cat >expect <<-\EOF &&
1102 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1103 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1104 EOF
1105 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1106 cat >input <<-INPUT_END &&
1107 commit refs/heads/N4
1108 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1109 data <<COMMIT
1110 copy by tree hash
1111 COMMIT
1112
1113 from refs/heads/branch^0
1114 M 040000 $subdir file3
1115 INPUT_END
1116 git fast-import <input &&
1117 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1118 compare_diff_raw expect actual
1119 '
1120
1121 test_expect_success PIPE 'N: read and copy directory' '
1122 cat >expect <<-\EOF &&
1123 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1124 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1125 EOF
1126 git update-ref -d refs/heads/N4 &&
1127 rm -f backflow &&
1128 mkfifo backflow &&
1129 (
1130 exec <backflow &&
1131 cat <<-EOF &&
1132 commit refs/heads/N4
1133 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1134 data <<COMMIT
1135 copy by tree hash, part 2
1136 COMMIT
1137
1138 from refs/heads/branch^0
1139 ls "file2"
1140 EOF
1141 read mode type tree filename &&
1142 echo "M 040000 $tree file3"
1143 ) |
1144 git fast-import --cat-blob-fd=3 3>backflow &&
1145 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1146 compare_diff_raw expect actual
1147 '
1148
1149 test_expect_success PIPE 'N: empty directory reads as missing' '
1150 cat <<-\EOF >expect &&
1151 OBJNAME
1152 :000000 100644 OBJNAME OBJNAME A unrelated
1153 EOF
1154 echo "missing src" >expect.response &&
1155 git update-ref -d refs/heads/read-empty &&
1156 rm -f backflow &&
1157 mkfifo backflow &&
1158 (
1159 exec <backflow &&
1160 cat <<-EOF &&
1161 commit refs/heads/read-empty
1162 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1163 data <<COMMIT
1164 read "empty" (missing) directory
1165 COMMIT
1166
1167 M 100644 inline src/greeting
1168 data <<BLOB
1169 hello
1170 BLOB
1171 C src/greeting dst1/non-greeting
1172 C src/greeting unrelated
1173 # leave behind "empty" src directory
1174 D src/greeting
1175 ls "src"
1176 EOF
1177 read -r line &&
1178 printf "%s\n" "$line" >response &&
1179 cat <<-\EOF
1180 D dst1
1181 D dst2
1182 EOF
1183 ) |
1184 git fast-import --cat-blob-fd=3 3>backflow &&
1185 test_cmp expect.response response &&
1186 git rev-list read-empty |
1187 git diff-tree -r --root --stdin |
1188 sed "s/$_x40/OBJNAME/g" >actual &&
1189 test_cmp expect actual
1190 '
1191
1192 test_expect_success 'N: copy root directory by tree hash' '
1193 cat >expect <<-\EOF &&
1194 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf
1195 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf
1196 EOF
1197 root=$(git rev-parse refs/heads/branch^0^{tree}) &&
1198 cat >input <<-INPUT_END &&
1199 commit refs/heads/N6
1200 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1201 data <<COMMIT
1202 copy root directory by tree hash
1203 COMMIT
1204
1205 from refs/heads/branch^0
1206 M 040000 $root ""
1207 INPUT_END
1208 git fast-import <input &&
1209 git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
1210 compare_diff_raw expect actual
1211 '
1212
1213 test_expect_success 'N: copy root by path' '
1214 cat >expect <<-\EOF &&
1215 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf oldroot/file2/newf
1216 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf oldroot/file2/oldf
1217 :100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 C100 file4 oldroot/file4
1218 :100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 C100 newdir/exec.sh oldroot/newdir/exec.sh
1219 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting oldroot/newdir/interesting
1220 EOF
1221 cat >input <<-INPUT_END &&
1222 commit refs/heads/N-copy-root-path
1223 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1224 data <<COMMIT
1225 copy root directory by (empty) path
1226 COMMIT
1227
1228 from refs/heads/branch^0
1229 C "" oldroot
1230 INPUT_END
1231 git fast-import <input &&
1232 git diff-tree -C --find-copies-harder -r branch N-copy-root-path >actual &&
1233 compare_diff_raw expect actual
1234 '
1235
1236 test_expect_success 'N: delete directory by copying' '
1237 cat >expect <<-\EOF &&
1238 OBJID
1239 :100644 000000 OBJID OBJID D foo/bar/qux
1240 OBJID
1241 :000000 100644 OBJID OBJID A foo/bar/baz
1242 :000000 100644 OBJID OBJID A foo/bar/qux
1243 EOF
1244 empty_tree=$(git mktree </dev/null) &&
1245 cat >input <<-INPUT_END &&
1246 commit refs/heads/N-delete
1247 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1248 data <<COMMIT
1249 collect data to be deleted
1250 COMMIT
1251
1252 deleteall
1253 M 100644 inline foo/bar/baz
1254 data <<DATA_END
1255 hello
1256 DATA_END
1257 C "foo/bar/baz" "foo/bar/qux"
1258 C "foo/bar/baz" "foo/bar/quux/1"
1259 C "foo/bar/baz" "foo/bar/quuux"
1260 M 040000 $empty_tree foo/bar/quux
1261 M 040000 $empty_tree foo/bar/quuux
1262
1263 commit refs/heads/N-delete
1264 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1265 data <<COMMIT
1266 delete subdirectory
1267 COMMIT
1268
1269 M 040000 $empty_tree foo/bar/qux
1270 INPUT_END
1271 git fast-import <input &&
1272 git rev-list N-delete |
1273 git diff-tree -r --stdin --root --always |
1274 sed -e "s/$_x40/OBJID/g" >actual &&
1275 test_cmp expect actual
1276 '
1277
1278 test_expect_success 'N: modify copied tree' '
1279 cat >expect <<-\EOF &&
1280 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
1281 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1282 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1283 EOF
1284 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1285 cat >input <<-INPUT_END &&
1286 commit refs/heads/N5
1287 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1288 data <<COMMIT
1289 copy by tree hash
1290 COMMIT
1291
1292 from refs/heads/branch^0
1293 M 040000 $subdir file3
1294
1295 commit refs/heads/N5
1296 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1297 data <<COMMIT
1298 modify directory copy
1299 COMMIT
1300
1301 M 644 inline file3/file5
1302 data <<EOF
1303 $file5_data
1304 EOF
1305 INPUT_END
1306 git fast-import <input &&
1307 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
1308 compare_diff_raw expect actual
1309 '
1310
1311 test_expect_success 'N: reject foo/ syntax' '
1312 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1313 test_must_fail git fast-import <<-INPUT_END
1314 commit refs/heads/N5B
1315 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1316 data <<COMMIT
1317 copy with invalid syntax
1318 COMMIT
1319
1320 from refs/heads/branch^0
1321 M 040000 $subdir file3/
1322 INPUT_END
1323 '
1324
1325 test_expect_success 'N: reject foo/ syntax in copy source' '
1326 test_must_fail git fast-import <<-INPUT_END
1327 commit refs/heads/N5C
1328 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1329 data <<COMMIT
1330 copy with invalid syntax
1331 COMMIT
1332
1333 from refs/heads/branch^0
1334 C file2/ file3
1335 INPUT_END
1336 '
1337
1338 test_expect_success 'N: reject foo/ syntax in rename source' '
1339 test_must_fail git fast-import <<-INPUT_END
1340 commit refs/heads/N5D
1341 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1342 data <<COMMIT
1343 rename with invalid syntax
1344 COMMIT
1345
1346 from refs/heads/branch^0
1347 R file2/ file3
1348 INPUT_END
1349 '
1350
1351 test_expect_success 'N: reject foo/ syntax in ls argument' '
1352 test_must_fail git fast-import <<-INPUT_END
1353 commit refs/heads/N5E
1354 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1355 data <<COMMIT
1356 copy with invalid syntax
1357 COMMIT
1358
1359 from refs/heads/branch^0
1360 ls "file2/"
1361 INPUT_END
1362 '
1363
1364 test_expect_success 'N: copy to root by id and modify' '
1365 echo "hello, world" >expect.foo &&
1366 echo hello >expect.bar &&
1367 git fast-import <<-SETUP_END &&
1368 commit refs/heads/N7
1369 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1370 data <<COMMIT
1371 hello, tree
1372 COMMIT
1373
1374 deleteall
1375 M 644 inline foo/bar
1376 data <<EOF
1377 hello
1378 EOF
1379 SETUP_END
1380
1381 tree=$(git rev-parse --verify N7:) &&
1382 git fast-import <<-INPUT_END &&
1383 commit refs/heads/N8
1384 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1385 data <<COMMIT
1386 copy to root by id and modify
1387 COMMIT
1388
1389 M 040000 $tree ""
1390 M 644 inline foo/foo
1391 data <<EOF
1392 hello, world
1393 EOF
1394 INPUT_END
1395 git show N8:foo/foo >actual.foo &&
1396 git show N8:foo/bar >actual.bar &&
1397 test_cmp expect.foo actual.foo &&
1398 test_cmp expect.bar actual.bar
1399 '
1400
1401 test_expect_success 'N: extract subtree' '
1402 branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1403 cat >input <<-INPUT_END &&
1404 commit refs/heads/N9
1405 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1406 data <<COMMIT
1407 extract subtree branch:newdir
1408 COMMIT
1409
1410 M 040000 $branch ""
1411 C "newdir" ""
1412 INPUT_END
1413 git fast-import <input &&
1414 git diff --exit-code branch:newdir N9
1415 '
1416
1417 test_expect_success 'N: modify subtree, extract it, and modify again' '
1418 echo hello >expect.baz &&
1419 echo hello, world >expect.qux &&
1420 git fast-import <<-SETUP_END &&
1421 commit refs/heads/N10
1422 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1423 data <<COMMIT
1424 hello, tree
1425 COMMIT
1426
1427 deleteall
1428 M 644 inline foo/bar/baz
1429 data <<EOF
1430 hello
1431 EOF
1432 SETUP_END
1433
1434 tree=$(git rev-parse --verify N10:) &&
1435 git fast-import <<-INPUT_END &&
1436 commit refs/heads/N11
1437 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1438 data <<COMMIT
1439 copy to root by id and modify
1440 COMMIT
1441
1442 M 040000 $tree ""
1443 M 100644 inline foo/bar/qux
1444 data <<EOF
1445 hello, world
1446 EOF
1447 R "foo" ""
1448 C "bar/qux" "bar/quux"
1449 INPUT_END
1450 git show N11:bar/baz >actual.baz &&
1451 git show N11:bar/qux >actual.qux &&
1452 git show N11:bar/quux >actual.quux &&
1453 test_cmp expect.baz actual.baz &&
1454 test_cmp expect.qux actual.qux &&
1455 test_cmp expect.qux actual.quux'
1456
1457 ###
1458 ### series O
1459 ###
1460
1461 test_expect_success 'O: comments are all skipped' '
1462 cat >input <<-INPUT_END &&
1463 #we will
1464 commit refs/heads/O1
1465 # -- ignore all of this text
1466 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1467 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1468 data <<COMMIT
1469 dirty directory copy
1470 COMMIT
1471
1472 # do not forget the import blank line!
1473 #
1474 # yes, we started from our usual base of branch^0.
1475 # i like branch^0.
1476 from refs/heads/branch^0
1477 # and we need to reuse file2/file5 from N3 above.
1478 M 644 inline file2/file5
1479 # otherwise the tree will be different
1480 data <<EOF
1481 $file5_data
1482 EOF
1483
1484 # do not forget to copy file2 to file3
1485 C file2 file3
1486 #
1487 # or to delete file5 from file2.
1488 D file2/file5
1489 # are we done yet?
1490
1491 INPUT_END
1492
1493 git fast-import <input &&
1494 test $(git rev-parse N3) = $(git rev-parse O1)
1495 '
1496
1497 test_expect_success 'O: blank lines not necessary after data commands' '
1498 cat >input <<-INPUT_END &&
1499 commit refs/heads/O2
1500 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1501 data <<COMMIT
1502 dirty directory copy
1503 COMMIT
1504 from refs/heads/branch^0
1505 M 644 inline file2/file5
1506 data <<EOF
1507 $file5_data
1508 EOF
1509 C file2 file3
1510 D file2/file5
1511
1512 INPUT_END
1513
1514 git fast-import <input &&
1515 test $(git rev-parse N3) = $(git rev-parse O2)
1516 '
1517
1518 test_expect_success 'O: repack before next test' '
1519 git repack -a -d
1520 '
1521
1522 test_expect_success 'O: blank lines not necessary after other commands' '
1523 cat >input <<-INPUT_END &&
1524 commit refs/heads/O3
1525 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1526 data <<COMMIT
1527 zstring
1528 COMMIT
1529 commit refs/heads/O3
1530 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1531 data <<COMMIT
1532 zof
1533 COMMIT
1534 checkpoint
1535 commit refs/heads/O3
1536 mark :5
1537 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1538 data <<COMMIT
1539 zempty
1540 COMMIT
1541 checkpoint
1542 commit refs/heads/O3
1543 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1544 data <<COMMIT
1545 zcommits
1546 COMMIT
1547 reset refs/tags/O3-2nd
1548 from :5
1549 reset refs/tags/O3-3rd
1550 from :5
1551 INPUT_END
1552
1553 cat >expect <<-INPUT_END &&
1554 string
1555 of
1556 empty
1557 commits
1558 INPUT_END
1559
1560 git fast-import <input &&
1561 test 8 = $(find .git/objects/pack -type f | wc -l) &&
1562 test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) &&
1563 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1564 test_cmp expect actual
1565 '
1566
1567 test_expect_success 'O: progress outputs as requested by input' '
1568 cat >input <<-INPUT_END &&
1569 commit refs/heads/O4
1570 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1571 data <<COMMIT
1572 zstring
1573 COMMIT
1574 commit refs/heads/O4
1575 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1576 data <<COMMIT
1577 zof
1578 COMMIT
1579 progress Two commits down, 2 to go!
1580 commit refs/heads/O4
1581 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1582 data <<COMMIT
1583 zempty
1584 COMMIT
1585 progress Three commits down, 1 to go!
1586 commit refs/heads/O4
1587 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1588 data <<COMMIT
1589 zcommits
1590 COMMIT
1591 progress done!
1592 INPUT_END
1593 git fast-import <input >actual &&
1594 grep "progress " <input >expect &&
1595 test_cmp expect actual
1596 '
1597
1598 ###
1599 ### series P (gitlinks)
1600 ###
1601
1602 test_expect_success 'P: superproject & submodule mix' '
1603 cat >input <<-INPUT_END &&
1604 blob
1605 mark :1
1606 data 10
1607 test file
1608
1609 reset refs/heads/sub
1610 commit refs/heads/sub
1611 mark :2
1612 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1613 data 12
1614 sub_initial
1615 M 100644 :1 file
1616
1617 blob
1618 mark :3
1619 data <<DATAEND
1620 [submodule "sub"]
1621 path = sub
1622 url = "$(pwd)/sub"
1623 DATAEND
1624
1625 commit refs/heads/subuse1
1626 mark :4
1627 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1628 data 8
1629 initial
1630 from refs/heads/master
1631 M 100644 :3 .gitmodules
1632 M 160000 :2 sub
1633
1634 blob
1635 mark :5
1636 data 20
1637 test file
1638 more data
1639
1640 commit refs/heads/sub
1641 mark :6
1642 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1643 data 11
1644 sub_second
1645 from :2
1646 M 100644 :5 file
1647
1648 commit refs/heads/subuse1
1649 mark :7
1650 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1651 data 7
1652 second
1653 from :4
1654 M 160000 :6 sub
1655
1656 INPUT_END
1657
1658 git fast-import <input &&
1659 git checkout subuse1 &&
1660 rm -rf sub &&
1661 mkdir sub &&
1662 (
1663 cd sub &&
1664 git init &&
1665 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1666 git checkout master
1667 ) &&
1668 git submodule init &&
1669 git submodule update
1670 '
1671
1672 test_expect_success 'P: verbatim SHA gitlinks' '
1673 SUBLAST=$(git rev-parse --verify sub) &&
1674 SUBPREV=$(git rev-parse --verify sub^) &&
1675
1676 cat >input <<-INPUT_END &&
1677 blob
1678 mark :1
1679 data <<DATAEND
1680 [submodule "sub"]
1681 path = sub
1682 url = "$(pwd)/sub"
1683 DATAEND
1684
1685 commit refs/heads/subuse2
1686 mark :2
1687 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1688 data 8
1689 initial
1690 from refs/heads/master
1691 M 100644 :1 .gitmodules
1692 M 160000 $SUBPREV sub
1693
1694 commit refs/heads/subuse2
1695 mark :3
1696 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1697 data 7
1698 second
1699 from :2
1700 M 160000 $SUBLAST sub
1701
1702 INPUT_END
1703
1704 git branch -D sub &&
1705 git gc &&
1706 git prune &&
1707 git fast-import <input &&
1708 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)
1709 '
1710
1711 test_expect_success 'P: fail on inline gitlink' '
1712 test_tick &&
1713 cat >input <<-INPUT_END &&
1714 commit refs/heads/subuse3
1715 mark :1
1716 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1717 data <<COMMIT
1718 corrupt
1719 COMMIT
1720
1721 from refs/heads/subuse2
1722 M 160000 inline sub
1723 data <<DATA
1724 $SUBPREV
1725 DATA
1726
1727 INPUT_END
1728
1729 test_must_fail git fast-import <input
1730 '
1731
1732 test_expect_success 'P: fail on blob mark in gitlink' '
1733 test_tick &&
1734 cat >input <<-INPUT_END &&
1735 blob
1736 mark :1
1737 data <<DATA
1738 $SUBPREV
1739 DATA
1740
1741 commit refs/heads/subuse3
1742 mark :2
1743 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1744 data <<COMMIT
1745 corrupt
1746 COMMIT
1747
1748 from refs/heads/subuse2
1749 M 160000 :1 sub
1750
1751 INPUT_END
1752
1753 test_must_fail git fast-import <input
1754 '
1755
1756 ###
1757 ### series Q (notes)
1758 ###
1759
1760 test_expect_success 'Q: commit notes' '
1761 note1_data="The first note for the first commit" &&
1762 note2_data="The first note for the second commit" &&
1763 note3_data="The first note for the third commit" &&
1764 note1b_data="The second note for the first commit" &&
1765 note1c_data="The third note for the first commit" &&
1766 note2b_data="The second note for the second commit" &&
1767
1768 test_tick &&
1769 cat >input <<-INPUT_END &&
1770 blob
1771 mark :2
1772 data <<EOF
1773 $file2_data
1774 EOF
1775
1776 commit refs/heads/notes-test
1777 mark :3
1778 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1779 data <<COMMIT
1780 first (:3)
1781 COMMIT
1782
1783 M 644 :2 file2
1784
1785 blob
1786 mark :4
1787 data $file4_len
1788 $file4_data
1789 commit refs/heads/notes-test
1790 mark :5
1791 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1792 data <<COMMIT
1793 second (:5)
1794 COMMIT
1795
1796 M 644 :4 file4
1797
1798 commit refs/heads/notes-test
1799 mark :6
1800 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1801 data <<COMMIT
1802 third (:6)
1803 COMMIT
1804
1805 M 644 inline file5
1806 data <<EOF
1807 $file5_data
1808 EOF
1809
1810 M 755 inline file6
1811 data <<EOF
1812 $file6_data
1813 EOF
1814
1815 blob
1816 mark :7
1817 data <<EOF
1818 $note1_data
1819 EOF
1820
1821 blob
1822 mark :8
1823 data <<EOF
1824 $note2_data
1825 EOF
1826
1827 commit refs/notes/foobar
1828 mark :9
1829 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1830 data <<COMMIT
1831 notes (:9)
1832 COMMIT
1833
1834 N :7 :3
1835 N :8 :5
1836 N inline :6
1837 data <<EOF
1838 $note3_data
1839 EOF
1840
1841 commit refs/notes/foobar
1842 mark :10
1843 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1844 data <<COMMIT
1845 notes (:10)
1846 COMMIT
1847
1848 N inline :3
1849 data <<EOF
1850 $note1b_data
1851 EOF
1852
1853 commit refs/notes/foobar2
1854 mark :11
1855 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1856 data <<COMMIT
1857 notes (:11)
1858 COMMIT
1859
1860 N inline :3
1861 data <<EOF
1862 $note1c_data
1863 EOF
1864
1865 commit refs/notes/foobar
1866 mark :12
1867 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1868 data <<COMMIT
1869 notes (:12)
1870 COMMIT
1871
1872 deleteall
1873 N inline :5
1874 data <<EOF
1875 $note2b_data
1876 EOF
1877
1878 INPUT_END
1879
1880 git fast-import <input &&
1881 git whatchanged notes-test
1882 '
1883
1884 test_expect_success 'Q: verify pack' '
1885 verify_packs
1886 '
1887
1888 test_expect_success 'Q: verify first commit' '
1889 commit1=$(git rev-parse notes-test~2) &&
1890 commit2=$(git rev-parse notes-test^) &&
1891 commit3=$(git rev-parse notes-test) &&
1892
1893 cat >expect <<-EOF &&
1894 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1895 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1896
1897 first (:3)
1898 EOF
1899 git cat-file commit notes-test~2 | sed 1d >actual &&
1900 test_cmp expect actual
1901 '
1902
1903 test_expect_success 'Q: verify second commit' '
1904 cat >expect <<-EOF &&
1905 parent $commit1
1906 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1907 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1908
1909 second (:5)
1910 EOF
1911 git cat-file commit notes-test^ | sed 1d >actual &&
1912 test_cmp expect actual
1913 '
1914
1915 test_expect_success 'Q: verify third commit' '
1916 cat >expect <<-EOF &&
1917 parent $commit2
1918 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1919 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1920
1921 third (:6)
1922 EOF
1923 git cat-file commit notes-test | sed 1d >actual &&
1924 test_cmp expect actual
1925 '
1926
1927 test_expect_success 'Q: verify first notes commit' '
1928 cat >expect <<-EOF &&
1929 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1930 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1931
1932 notes (:9)
1933 EOF
1934 git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1935 test_cmp expect actual
1936 '
1937
1938 test_expect_success 'Q: verify first notes tree' '
1939 cat >expect.unsorted <<-EOF &&
1940 100644 blob $commit1
1941 100644 blob $commit2
1942 100644 blob $commit3
1943 EOF
1944 cat expect.unsorted | sort >expect &&
1945 git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1946 test_cmp expect actual
1947 '
1948
1949 test_expect_success 'Q: verify first note for first commit' '
1950 echo "$note1_data" >expect &&
1951 git cat-file blob refs/notes/foobar~2:$commit1 >actual &&
1952 test_cmp expect actual
1953 '
1954
1955 test_expect_success 'Q: verify first note for second commit' '
1956 echo "$note2_data" >expect &&
1957 git cat-file blob refs/notes/foobar~2:$commit2 >actual &&
1958 test_cmp expect actual
1959 '
1960
1961 test_expect_success 'Q: verify first note for third commit' '
1962 echo "$note3_data" >expect &&
1963 git cat-file blob refs/notes/foobar~2:$commit3 >actual &&
1964 test_cmp expect actual
1965 '
1966
1967 test_expect_success 'Q: verify second notes commit' '
1968 cat >expect <<-EOF &&
1969 parent $(git rev-parse --verify refs/notes/foobar~2)
1970 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1971 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1972
1973 notes (:10)
1974 EOF
1975 git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1976 test_cmp expect actual
1977 '
1978
1979 test_expect_success 'Q: verify second notes tree' '
1980 cat >expect.unsorted <<-EOF &&
1981 100644 blob $commit1
1982 100644 blob $commit2
1983 100644 blob $commit3
1984 EOF
1985 cat expect.unsorted | sort >expect &&
1986 git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1987 test_cmp expect actual
1988 '
1989
1990 test_expect_success 'Q: verify second note for first commit' '
1991 echo "$note1b_data" >expect &&
1992 git cat-file blob refs/notes/foobar^:$commit1 >actual &&
1993 test_cmp expect actual
1994 '
1995
1996 test_expect_success 'Q: verify first note for second commit' '
1997 echo "$note2_data" >expect &&
1998 git cat-file blob refs/notes/foobar^:$commit2 >actual &&
1999 test_cmp expect actual
2000 '
2001
2002 test_expect_success 'Q: verify first note for third commit' '
2003 echo "$note3_data" >expect &&
2004 git cat-file blob refs/notes/foobar^:$commit3 >actual &&
2005 test_cmp expect actual
2006 '
2007
2008 test_expect_success 'Q: verify third notes commit' '
2009 cat >expect <<-EOF &&
2010 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2011 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2012
2013 notes (:11)
2014 EOF
2015 git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
2016 test_cmp expect actual
2017 '
2018
2019 test_expect_success 'Q: verify third notes tree' '
2020 cat >expect.unsorted <<-EOF &&
2021 100644 blob $commit1
2022 EOF
2023 cat expect.unsorted | sort >expect &&
2024 git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
2025 test_cmp expect actual
2026 '
2027
2028 test_expect_success 'Q: verify third note for first commit' '
2029 echo "$note1c_data" >expect &&
2030 git cat-file blob refs/notes/foobar2:$commit1 >actual &&
2031 test_cmp expect actual
2032 '
2033
2034 test_expect_success 'Q: verify fourth notes commit' '
2035 cat >expect <<-EOF &&
2036 parent $(git rev-parse --verify refs/notes/foobar^)
2037 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2038 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2039
2040 notes (:12)
2041 EOF
2042 git cat-file commit refs/notes/foobar | sed 1d >actual &&
2043 test_cmp expect actual
2044 '
2045
2046 test_expect_success 'Q: verify fourth notes tree' '
2047 cat >expect.unsorted <<-EOF &&
2048 100644 blob $commit2
2049 EOF
2050 cat expect.unsorted | sort >expect &&
2051 git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
2052 test_cmp expect actual
2053 '
2054
2055 test_expect_success 'Q: verify second note for second commit' '
2056 echo "$note2b_data" >expect &&
2057 git cat-file blob refs/notes/foobar:$commit2 >actual &&
2058 test_cmp expect actual
2059 '
2060
2061 test_expect_success 'Q: deny note on empty branch' '
2062 cat >input <<-EOF &&
2063 reset refs/heads/Q0
2064
2065 commit refs/heads/note-Q0
2066 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2067 data <<COMMIT
2068 Note for an empty branch.
2069 COMMIT
2070
2071 N inline refs/heads/Q0
2072 data <<NOTE
2073 some note
2074 NOTE
2075 EOF
2076 test_must_fail git fast-import <input
2077 '
2078 ###
2079 ### series R (feature and option)
2080 ###
2081
2082 test_expect_success 'R: abort on unsupported feature' '
2083 cat >input <<-EOF &&
2084 feature no-such-feature-exists
2085 EOF
2086
2087 test_must_fail git fast-import <input
2088 '
2089
2090 test_expect_success 'R: supported feature is accepted' '
2091 cat >input <<-EOF &&
2092 feature date-format=now
2093 EOF
2094
2095 git fast-import <input
2096 '
2097
2098 test_expect_success 'R: abort on receiving feature after data command' '
2099 cat >input <<-EOF &&
2100 blob
2101 data 3
2102 hi
2103 feature date-format=now
2104 EOF
2105
2106 test_must_fail git fast-import <input
2107 '
2108
2109 test_expect_success 'R: only one import-marks feature allowed per stream' '
2110 >git.marks &&
2111 >git2.marks &&
2112 cat >input <<-EOF &&
2113 feature import-marks=git.marks
2114 feature import-marks=git2.marks
2115 EOF
2116
2117 test_must_fail git fast-import <input
2118 '
2119
2120 test_expect_success 'R: export-marks feature results in a marks file being created' '
2121 cat >input <<-EOF &&
2122 feature export-marks=git.marks
2123 blob
2124 mark :1
2125 data 3
2126 hi
2127
2128 EOF
2129
2130 git fast-import <input &&
2131 grep :1 git.marks
2132 '
2133
2134 test_expect_success 'R: export-marks options can be overridden by commandline options' '
2135 cat >input <<-\EOF &&
2136 feature export-marks=feature-sub/git.marks
2137 blob
2138 mark :1
2139 data 3
2140 hi
2141
2142 EOF
2143 git fast-import --export-marks=cmdline-sub/other.marks <input &&
2144 grep :1 cmdline-sub/other.marks &&
2145 test_path_is_missing feature-sub
2146 '
2147
2148 test_expect_success 'R: catch typo in marks file name' '
2149 test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
2150 echo "feature import-marks=nonexistent.marks" |
2151 test_must_fail git fast-import
2152 '
2153
2154 test_expect_success 'R: import and output marks can be the same file' '
2155 rm -f io.marks &&
2156 blob=$(echo hi | git hash-object --stdin) &&
2157 cat >expect <<-EOF &&
2158 :1 $blob
2159 :2 $blob
2160 EOF
2161 git fast-import --export-marks=io.marks <<-\EOF &&
2162 blob
2163 mark :1
2164 data 3
2165 hi
2166
2167 EOF
2168 git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
2169 blob
2170 mark :2
2171 data 3
2172 hi
2173
2174 EOF
2175 test_cmp expect io.marks
2176 '
2177
2178 test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' '
2179 rm -f io.marks &&
2180 test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
2181 blob
2182 mark :1
2183 data 3
2184 hi
2185
2186 EOF
2187 '
2188
2189 test_expect_success 'R: --import-marks-if-exists' '
2190 rm -f io.marks &&
2191 blob=$(echo hi | git hash-object --stdin) &&
2192 echo ":1 $blob" >expect &&
2193 git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
2194 blob
2195 mark :1
2196 data 3
2197 hi
2198
2199 EOF
2200 test_cmp expect io.marks
2201 '
2202
2203 test_expect_success 'R: feature import-marks-if-exists' '
2204 rm -f io.marks &&
2205 >expect &&
2206
2207 git fast-import --export-marks=io.marks <<-\EOF &&
2208 feature import-marks-if-exists=not_io.marks
2209 EOF
2210 test_cmp expect io.marks &&
2211
2212 blob=$(echo hi | git hash-object --stdin) &&
2213
2214 echo ":1 $blob" >io.marks &&
2215 echo ":1 $blob" >expect &&
2216 echo ":2 $blob" >>expect &&
2217
2218 git fast-import --export-marks=io.marks <<-\EOF &&
2219 feature import-marks-if-exists=io.marks
2220 blob
2221 mark :2
2222 data 3
2223 hi
2224
2225 EOF
2226 test_cmp expect io.marks &&
2227
2228 echo ":3 $blob" >>expect &&
2229
2230 git fast-import --import-marks=io.marks \
2231 --export-marks=io.marks <<-\EOF &&
2232 feature import-marks-if-exists=not_io.marks
2233 blob
2234 mark :3
2235 data 3
2236 hi
2237
2238 EOF
2239 test_cmp expect io.marks &&
2240
2241 >expect &&
2242
2243 git fast-import --import-marks-if-exists=not_io.marks \
2244 --export-marks=io.marks <<-\EOF &&
2245 feature import-marks-if-exists=io.marks
2246 EOF
2247 test_cmp expect io.marks
2248 '
2249
2250 test_expect_success 'R: import to output marks works without any content' '
2251 cat >input <<-EOF &&
2252 feature import-marks=marks.out
2253 feature export-marks=marks.new
2254 EOF
2255
2256 git fast-import <input &&
2257 test_cmp marks.out marks.new
2258 '
2259
2260 test_expect_success 'R: import marks prefers commandline marks file over the stream' '
2261 cat >input <<-EOF &&
2262 feature import-marks=nonexistent.marks
2263 feature export-marks=marks.new
2264 EOF
2265
2266 git fast-import --import-marks=marks.out <input &&
2267 test_cmp marks.out marks.new
2268 '
2269
2270
2271 test_expect_success 'R: multiple --import-marks= should be honoured' '
2272 cat >input <<-EOF &&
2273 feature import-marks=nonexistent.marks
2274 feature export-marks=combined.marks
2275 EOF
2276
2277 head -n2 marks.out > one.marks &&
2278 tail -n +3 marks.out > two.marks &&
2279 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
2280 test_cmp marks.out combined.marks
2281 '
2282
2283 test_expect_success 'R: feature relative-marks should be honoured' '
2284 cat >input <<-EOF &&
2285 feature relative-marks
2286 feature import-marks=relative.in
2287 feature export-marks=relative.out
2288 EOF
2289
2290 mkdir -p .git/info/fast-import/ &&
2291 cp marks.new .git/info/fast-import/relative.in &&
2292 git fast-import <input &&
2293 test_cmp marks.new .git/info/fast-import/relative.out
2294 '
2295
2296 test_expect_success 'R: feature no-relative-marks should be honoured' '
2297 cat >input <<-EOF &&
2298 feature relative-marks
2299 feature import-marks=relative.in
2300 feature no-relative-marks
2301 feature export-marks=non-relative.out
2302 EOF
2303
2304 git fast-import <input &&
2305 test_cmp marks.new non-relative.out
2306 '
2307
2308 test_expect_success 'R: feature ls supported' '
2309 echo "feature ls" |
2310 git fast-import
2311 '
2312
2313 test_expect_success 'R: feature cat-blob supported' '
2314 echo "feature cat-blob" |
2315 git fast-import
2316 '
2317
2318 test_expect_success 'R: cat-blob-fd must be a nonnegative integer' '
2319 test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
2320 '
2321
2322 test_expect_success !MINGW 'R: print old blob' '
2323 blob=$(echo "yes it can" | git hash-object -w --stdin) &&
2324 cat >expect <<-EOF &&
2325 ${blob} blob 11
2326 yes it can
2327
2328 EOF
2329 echo "cat-blob $blob" |
2330 git fast-import --cat-blob-fd=6 6>actual &&
2331 test_cmp expect actual
2332 '
2333
2334 test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' '
2335 echo hello >greeting &&
2336 blob=$(git hash-object -w greeting) &&
2337 cat >expect <<-EOF &&
2338 ${blob} blob 6
2339 hello
2340
2341 EOF
2342 git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
2343 cat-blob $blob
2344 EOF
2345 test_cmp expect actual.3 &&
2346 test_must_be_empty actual.1 &&
2347 git fast-import 3>actual.3 >actual.1 <<-EOF &&
2348 option cat-blob-fd=3
2349 cat-blob $blob
2350 EOF
2351 test_must_be_empty actual.3 &&
2352 test_cmp expect actual.1
2353 '
2354
2355 test_expect_success !MINGW 'R: print mark for new blob' '
2356 echo "effluentish" | git hash-object --stdin >expect &&
2357 git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2358 blob
2359 mark :1
2360 data <<BLOB_END
2361 effluentish
2362 BLOB_END
2363 get-mark :1
2364 EOF
2365 test_cmp expect actual
2366 '
2367
2368 test_expect_success !MINGW 'R: print new blob' '
2369 blob=$(echo "yep yep yep" | git hash-object --stdin) &&
2370 cat >expect <<-EOF &&
2371 ${blob} blob 12
2372 yep yep yep
2373
2374 EOF
2375 git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2376 blob
2377 mark :1
2378 data <<BLOB_END
2379 yep yep yep
2380 BLOB_END
2381 cat-blob :1
2382 EOF
2383 test_cmp expect actual
2384 '
2385
2386 test_expect_success !MINGW 'R: print new blob by sha1' '
2387 blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
2388 cat >expect <<-EOF &&
2389 ${blob} blob 25
2390 a new blob named by sha1
2391
2392 EOF
2393 git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
2394 blob
2395 data <<BLOB_END
2396 a new blob named by sha1
2397 BLOB_END
2398 cat-blob $blob
2399 EOF
2400 test_cmp expect actual
2401 '
2402
2403 test_expect_success 'setup: big file' '
2404 (
2405 echo "the quick brown fox jumps over the lazy dog" >big &&
2406 for i in 1 2 3
2407 do
2408 cat big big big big >bigger &&
2409 cat bigger bigger bigger bigger >big ||
2410 exit
2411 done
2412 )
2413 '
2414
2415 test_expect_success 'R: print two blobs to stdout' '
2416 blob1=$(git hash-object big) &&
2417 blob1_len=$(wc -c <big) &&
2418 blob2=$(echo hello | git hash-object --stdin) &&
2419 {
2420 echo ${blob1} blob $blob1_len &&
2421 cat big &&
2422 cat <<-EOF
2423
2424 ${blob2} blob 6
2425 hello
2426
2427 EOF
2428 } >expect &&
2429 {
2430 cat <<-\END_PART1 &&
2431 blob
2432 mark :1
2433 data <<data_end
2434 END_PART1
2435 cat big &&
2436 cat <<-\EOF
2437 data_end
2438 blob
2439 mark :2
2440 data <<data_end
2441 hello
2442 data_end
2443 cat-blob :1
2444 cat-blob :2
2445 EOF
2446 } |
2447 git fast-import >actual &&
2448 test_cmp expect actual
2449 '
2450
2451 test_expect_success PIPE 'R: copy using cat-file' '
2452 expect_id=$(git hash-object big) &&
2453 expect_len=$(wc -c <big) &&
2454 echo $expect_id blob $expect_len >expect.response &&
2455
2456 rm -f blobs &&
2457 cat >frontend <<-\FRONTEND_END &&
2458 #!/bin/sh
2459 FRONTEND_END
2460
2461 mkfifo blobs &&
2462 (
2463 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
2464 cat <<-\EOF &&
2465 feature cat-blob
2466 blob
2467 mark :1
2468 data <<BLOB
2469 EOF
2470 cat big &&
2471 cat <<-\EOF &&
2472 BLOB
2473 cat-blob :1
2474 EOF
2475
2476 read blob_id type size <&3 &&
2477 echo "$blob_id $type $size" >response &&
2478 test_copy_bytes $size >blob <&3 &&
2479 read newline <&3 &&
2480
2481 cat <<-EOF &&
2482 commit refs/heads/copied
2483 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2484 data <<COMMIT
2485 copy big file as file3
2486 COMMIT
2487 M 644 inline file3
2488 data <<BLOB
2489 EOF
2490 cat blob &&
2491 echo BLOB
2492 ) 3<blobs |
2493 git fast-import --cat-blob-fd=3 3>blobs &&
2494 git show copied:file3 >actual &&
2495 test_cmp expect.response response &&
2496 test_cmp big actual
2497 '
2498
2499 test_expect_success PIPE 'R: print blob mid-commit' '
2500 rm -f blobs &&
2501 echo "A blob from _before_ the commit." >expect &&
2502 mkfifo blobs &&
2503 (
2504 exec 3<blobs &&
2505 cat <<-EOF &&
2506 feature cat-blob
2507 blob
2508 mark :1
2509 data <<BLOB
2510 A blob from _before_ the commit.
2511 BLOB
2512 commit refs/heads/temporary
2513 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2514 data <<COMMIT
2515 Empty commit
2516 COMMIT
2517 cat-blob :1
2518 EOF
2519
2520 read blob_id type size <&3 &&
2521 test_copy_bytes $size >actual <&3 &&
2522 read newline <&3 &&
2523
2524 echo
2525 ) |
2526 git fast-import --cat-blob-fd=3 3>blobs &&
2527 test_cmp expect actual
2528 '
2529
2530 test_expect_success PIPE 'R: print staged blob within commit' '
2531 rm -f blobs &&
2532 echo "A blob from _within_ the commit." >expect &&
2533 mkfifo blobs &&
2534 (
2535 exec 3<blobs &&
2536 cat <<-EOF &&
2537 feature cat-blob
2538 commit refs/heads/within
2539 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2540 data <<COMMIT
2541 Empty commit
2542 COMMIT
2543 M 644 inline within
2544 data <<BLOB
2545 A blob from _within_ the commit.
2546 BLOB
2547 EOF
2548
2549 to_get=$(
2550 echo "A blob from _within_ the commit." |
2551 git hash-object --stdin
2552 ) &&
2553 echo "cat-blob $to_get" &&
2554
2555 read blob_id type size <&3 &&
2556 test_copy_bytes $size >actual <&3 &&
2557 read newline <&3 &&
2558
2559 echo deleteall
2560 ) |
2561 git fast-import --cat-blob-fd=3 3>blobs &&
2562 test_cmp expect actual
2563 '
2564
2565 test_expect_success 'R: quiet option results in no stats being output' '
2566 cat >input <<-EOF &&
2567 option git quiet
2568 blob
2569 data 3
2570 hi
2571
2572 EOF
2573
2574 git fast-import 2>output <input &&
2575 test_must_be_empty output
2576 '
2577
2578 test_expect_success 'R: feature done means terminating "done" is mandatory' '
2579 echo feature done | test_must_fail git fast-import &&
2580 test_must_fail git fast-import --done </dev/null
2581 '
2582
2583 test_expect_success 'R: terminating "done" with trailing gibberish is ok' '
2584 git fast-import <<-\EOF &&
2585 feature done
2586 done
2587 trailing gibberish
2588 EOF
2589 git fast-import <<-\EOF
2590 done
2591 more trailing gibberish
2592 EOF
2593 '
2594
2595 test_expect_success 'R: terminating "done" within commit' '
2596 cat >expect <<-\EOF &&
2597 OBJID
2598 :000000 100644 OBJID OBJID A hello.c
2599 :000000 100644 OBJID OBJID A hello2.c
2600 EOF
2601 git fast-import <<-EOF &&
2602 commit refs/heads/done-ends
2603 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2604 data <<EOT
2605 Commit terminated by "done" command
2606 EOT
2607 M 100644 inline hello.c
2608 data <<EOT
2609 Hello, world.
2610 EOT
2611 C hello.c hello2.c
2612 done
2613 EOF
2614 git rev-list done-ends |
2615 git diff-tree -r --stdin --root --always |
2616 sed -e "s/$_x40/OBJID/g" >actual &&
2617 test_cmp expect actual
2618 '
2619
2620 test_expect_success 'R: die on unknown option' '
2621 cat >input <<-EOF &&
2622 option git non-existing-option
2623 EOF
2624
2625 test_must_fail git fast-import <input
2626 '
2627
2628 test_expect_success 'R: unknown commandline options are rejected' '\
2629 test_must_fail git fast-import --non-existing-option < /dev/null
2630 '
2631
2632 test_expect_success 'R: die on invalid option argument' '
2633 echo "option git active-branches=-5" |
2634 test_must_fail git fast-import &&
2635 echo "option git depth=" |
2636 test_must_fail git fast-import &&
2637 test_must_fail git fast-import --depth="5 elephants" </dev/null
2638 '
2639
2640 test_expect_success 'R: ignore non-git options' '
2641 cat >input <<-EOF &&
2642 option non-existing-vcs non-existing-option
2643 EOF
2644
2645 git fast-import <input
2646 '
2647
2648 test_expect_success 'R: corrupt lines do not mess marks file' '
2649 rm -f io.marks &&
2650 blob=$(echo hi | git hash-object --stdin) &&
2651 cat >expect <<-EOF &&
2652 :3 0000000000000000000000000000000000000000
2653 :1 $blob
2654 :2 $blob
2655 EOF
2656 cp expect io.marks &&
2657 test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
2658
2659 EOF
2660 test_cmp expect io.marks
2661 '
2662
2663 ##
2664 ## R: very large blobs
2665 ##
2666 test_expect_success 'R: blob bigger than threshold' '
2667 blobsize=$((2*1024*1024 + 53)) &&
2668 test-genrandom bar $blobsize >expect &&
2669 cat >input <<-INPUT_END &&
2670 commit refs/heads/big-file
2671 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2672 data <<COMMIT
2673 R - big file
2674 COMMIT
2675
2676 M 644 inline big1
2677 data $blobsize
2678 INPUT_END
2679 cat expect >>input &&
2680 cat >>input <<-INPUT_END &&
2681 M 644 inline big2
2682 data $blobsize
2683 INPUT_END
2684 cat expect >>input &&
2685 echo >>input &&
2686
2687 test_create_repo R &&
2688 git --git-dir=R/.git config fastimport.unpackLimit 0 &&
2689 git --git-dir=R/.git fast-import --big-file-threshold=1 <input
2690 '
2691
2692 test_expect_success 'R: verify created pack' '
2693 (
2694 cd R &&
2695 verify_packs -v > ../verify
2696 )
2697 '
2698
2699 test_expect_success 'R: verify written objects' '
2700 git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2701 test_cmp_bin expect actual &&
2702 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2703 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2704 test $a = $b
2705 '
2706
2707 test_expect_success 'R: blob appears only once' '
2708 n=$(grep $a verify | wc -l) &&
2709 test 1 = $n
2710 '
2711
2712 ###
2713 ### series S
2714 ###
2715 #
2716 # Make sure missing spaces and EOLs after mark references
2717 # cause errors.
2718 #
2719 # Setup:
2720 #
2721 # 1--2--4
2722 # \ /
2723 # -3-
2724 #
2725 # commit marks: 301, 302, 303, 304
2726 # blob marks: 403, 404, resp.
2727 # note mark: 202
2728 #
2729 # The error message when a space is missing not at the
2730 # end of the line is:
2731 #
2732 # Missing space after ..
2733 #
2734 # or when extra characters come after the mark at the end
2735 # of the line:
2736 #
2737 # Garbage after ..
2738 #
2739 # or when the dataref is neither "inline " or a known SHA1,
2740 #
2741 # Invalid dataref ..
2742 #
2743 test_expect_success 'S: initialize for S tests' '
2744 test_tick &&
2745
2746 cat >input <<-INPUT_END &&
2747 commit refs/heads/S
2748 mark :301
2749 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2750 data <<COMMIT
2751 commit 1
2752 COMMIT
2753 M 100644 inline hello.c
2754 data <<BLOB
2755 blob 1
2756 BLOB
2757
2758 commit refs/heads/S
2759 mark :302
2760 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2761 data <<COMMIT
2762 commit 2
2763 COMMIT
2764 from :301
2765 M 100644 inline hello.c
2766 data <<BLOB
2767 blob 2
2768 BLOB
2769
2770 blob
2771 mark :403
2772 data <<BLOB
2773 blob 3
2774 BLOB
2775
2776 blob
2777 mark :202
2778 data <<BLOB
2779 note 2
2780 BLOB
2781 INPUT_END
2782
2783 git fast-import --export-marks=marks <input
2784 '
2785
2786 #
2787 # filemodify, three datarefs
2788 #
2789 test_expect_success 'S: filemodify with garbage after mark must fail' '
2790 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2791 commit refs/heads/S
2792 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2793 data <<COMMIT
2794 commit N
2795 COMMIT
2796 M 100644 :403x hello.c
2797 EOF
2798 cat err &&
2799 test_i18ngrep "space after mark" err
2800 '
2801
2802 # inline is misspelled; fast-import thinks it is some unknown dataref
2803 test_expect_success 'S: filemodify with garbage after inline must fail' '
2804 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2805 commit refs/heads/S
2806 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2807 data <<COMMIT
2808 commit N
2809 COMMIT
2810 M 100644 inlineX hello.c
2811 data <<BLOB
2812 inline
2813 BLOB
2814 EOF
2815 cat err &&
2816 test_i18ngrep "nvalid dataref" err
2817 '
2818
2819 test_expect_success 'S: filemodify with garbage after sha1 must fail' '
2820 sha1=$(grep :403 marks | cut -d\ -f2) &&
2821 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2822 commit refs/heads/S
2823 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2824 data <<COMMIT
2825 commit N
2826 COMMIT
2827 M 100644 ${sha1}x hello.c
2828 EOF
2829 cat err &&
2830 test_i18ngrep "space after SHA1" err
2831 '
2832
2833 #
2834 # notemodify, three ways to say dataref
2835 #
2836 test_expect_success 'S: notemodify with garbage after mark dataref must fail' '
2837 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2838 commit refs/heads/S
2839 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2840 data <<COMMIT
2841 commit S note dataref markref
2842 COMMIT
2843 N :202x :302
2844 EOF
2845 cat err &&
2846 test_i18ngrep "space after mark" err
2847 '
2848
2849 test_expect_success 'S: notemodify with garbage after inline dataref must fail' '
2850 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2851 commit refs/heads/S
2852 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2853 data <<COMMIT
2854 commit S note dataref inline
2855 COMMIT
2856 N inlineX :302
2857 data <<BLOB
2858 note blob
2859 BLOB
2860 EOF
2861 cat err &&
2862 test_i18ngrep "nvalid dataref" err
2863 '
2864
2865 test_expect_success 'S: notemodify with garbage after sha1 dataref must fail' '
2866 sha1=$(grep :202 marks | cut -d\ -f2) &&
2867 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2868 commit refs/heads/S
2869 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2870 data <<COMMIT
2871 commit S note dataref sha1
2872 COMMIT
2873 N ${sha1}x :302
2874 EOF
2875 cat err &&
2876 test_i18ngrep "space after SHA1" err
2877 '
2878
2879 #
2880 # notemodify, mark in commit-ish
2881 #
2882 test_expect_success 'S: notemodify with garbage after mark commit-ish must fail' '
2883 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2884 commit refs/heads/Snotes
2885 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2886 data <<COMMIT
2887 commit S note commit-ish
2888 COMMIT
2889 N :202 :302x
2890 EOF
2891 cat err &&
2892 test_i18ngrep "after mark" err
2893 '
2894
2895 #
2896 # from
2897 #
2898 test_expect_success 'S: from with garbage after mark must fail' '
2899 test_must_fail \
2900 git fast-import --import-marks=marks --export-marks=marks <<-EOF 2>err &&
2901 commit refs/heads/S2
2902 mark :303
2903 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2904 data <<COMMIT
2905 commit 3
2906 COMMIT
2907 from :301x
2908 M 100644 :403 hello.c
2909 EOF
2910
2911
2912 # go create the commit, need it for merge test
2913 git fast-import --import-marks=marks --export-marks=marks <<-EOF &&
2914 commit refs/heads/S2
2915 mark :303
2916 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2917 data <<COMMIT
2918 commit 3
2919 COMMIT
2920 from :301
2921 M 100644 :403 hello.c
2922 EOF
2923
2924 # now evaluate the error
2925 cat err &&
2926 test_i18ngrep "after mark" err
2927 '
2928
2929
2930 #
2931 # merge
2932 #
2933 test_expect_success 'S: merge with garbage after mark must fail' '
2934 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2935 commit refs/heads/S
2936 mark :304
2937 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2938 data <<COMMIT
2939 merge 4
2940 COMMIT
2941 from :302
2942 merge :303x
2943 M 100644 :403 hello.c
2944 EOF
2945 cat err &&
2946 test_i18ngrep "after mark" err
2947 '
2948
2949 #
2950 # tag, from markref
2951 #
2952 test_expect_success 'S: tag with garbage after mark must fail' '
2953 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2954 tag refs/tags/Stag
2955 from :302x
2956 tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2957 data <<TAG
2958 tag S
2959 TAG
2960 EOF
2961 cat err &&
2962 test_i18ngrep "after mark" err
2963 '
2964
2965 #
2966 # cat-blob markref
2967 #
2968 test_expect_success 'S: cat-blob with garbage after mark must fail' '
2969 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2970 cat-blob :403x
2971 EOF
2972 cat err &&
2973 test_i18ngrep "after mark" err
2974 '
2975
2976 #
2977 # ls markref
2978 #
2979 test_expect_success 'S: ls with garbage after mark must fail' '
2980 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2981 ls :302x hello.c
2982 EOF
2983 cat err &&
2984 test_i18ngrep "space after mark" err
2985 '
2986
2987 test_expect_success 'S: ls with garbage after sha1 must fail' '
2988 sha1=$(grep :302 marks | cut -d\ -f2) &&
2989 test_must_fail git fast-import --import-marks=marks <<-EOF 2>err &&
2990 ls ${sha1}x hello.c
2991 EOF
2992 cat err &&
2993 test_i18ngrep "space after tree-ish" err
2994 '
2995
2996 ###
2997 ### series T (ls)
2998 ###
2999 # Setup is carried over from series S.
3000
3001 test_expect_success 'T: ls root tree' '
3002 sed -e "s/Z\$//" >expect <<-EOF &&
3003 040000 tree $(git rev-parse S^{tree}) Z
3004 EOF
3005 sha1=$(git rev-parse --verify S) &&
3006 git fast-import --import-marks=marks <<-EOF >actual &&
3007 ls $sha1 ""
3008 EOF
3009 test_cmp expect actual
3010 '
3011
3012 test_expect_success 'T: delete branch' '
3013 git branch to-delete &&
3014 git fast-import <<-EOF &&
3015 reset refs/heads/to-delete
3016 from 0000000000000000000000000000000000000000
3017 EOF
3018 test_must_fail git rev-parse --verify refs/heads/to-delete
3019 '
3020
3021 test_expect_success 'T: empty reset doesnt delete branch' '
3022 git branch not-to-delete &&
3023 git fast-import <<-EOF &&
3024 reset refs/heads/not-to-delete
3025 EOF
3026 git show-ref &&
3027 git rev-parse --verify refs/heads/not-to-delete
3028 '
3029
3030 ###
3031 ### series U (filedelete)
3032 ###
3033
3034 test_expect_success 'U: initialize for U tests' '
3035 cat >input <<-INPUT_END &&
3036 commit refs/heads/U
3037 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3038 data <<COMMIT
3039 test setup
3040 COMMIT
3041 M 100644 inline hello.c
3042 data <<BLOB
3043 blob 1
3044 BLOB
3045 M 100644 inline good/night.txt
3046 data <<BLOB
3047 sleep well
3048 BLOB
3049 M 100644 inline good/bye.txt
3050 data <<BLOB
3051 au revoir
3052 BLOB
3053
3054 INPUT_END
3055
3056 git fast-import <input
3057 '
3058
3059 test_expect_success 'U: filedelete file succeeds' '
3060 cat >input <<-INPUT_END &&
3061 commit refs/heads/U
3062 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3063 data <<COMMIT
3064 delete good/night.txt
3065 COMMIT
3066 from refs/heads/U^0
3067 D good/night.txt
3068
3069 INPUT_END
3070
3071 git fast-import <input
3072 '
3073
3074 test_expect_success 'U: validate file delete result' '
3075 cat >expect <<-EOF &&
3076 :100644 000000 2907ebb4bf85d91bf0716bb3bd8a68ef48d6da76 0000000000000000000000000000000000000000 D good/night.txt
3077 EOF
3078
3079 git diff-tree -M -r U^1 U >actual &&
3080
3081 compare_diff_raw expect actual
3082 '
3083
3084 test_expect_success 'U: filedelete directory succeeds' '
3085 cat >input <<-INPUT_END &&
3086 commit refs/heads/U
3087 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3088 data <<COMMIT
3089 delete good dir
3090 COMMIT
3091 from refs/heads/U^0
3092 D good
3093
3094 INPUT_END
3095
3096 git fast-import <input
3097 '
3098
3099 test_expect_success 'U: validate directory delete result' '
3100 cat >expect <<-EOF &&
3101 :100644 000000 69cb75792f55123d8389c156b0b41c2ff00ed507 0000000000000000000000000000000000000000 D good/bye.txt
3102 EOF
3103
3104 git diff-tree -M -r U^1 U >actual &&
3105
3106 compare_diff_raw expect actual
3107 '
3108
3109 test_expect_success 'U: filedelete root succeeds' '
3110 cat >input <<-INPUT_END &&
3111 commit refs/heads/U
3112 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3113 data <<COMMIT
3114 must succeed
3115 COMMIT
3116 from refs/heads/U^0
3117 D ""
3118
3119 INPUT_END
3120
3121 git fast-import <input
3122 '
3123
3124 test_expect_success 'U: validate root delete result' '
3125 cat >expect <<-EOF &&
3126 :100644 000000 c18147dc648481eeb65dc5e66628429a64843327 0000000000000000000000000000000000000000 D hello.c
3127 EOF
3128
3129 git diff-tree -M -r U^1 U >actual &&
3130
3131 compare_diff_raw expect actual
3132 '
3133
3134 ###
3135 ### series V (checkpoint)
3136 ###
3137
3138 # The commands in input_file should not produce any output on the file
3139 # descriptor set with --cat-blob-fd (or stdout if unspecified).
3140 #
3141 # To make sure you're observing the side effects of checkpoint *before*
3142 # fast-import terminates (and thus writes out its state), check that the
3143 # fast-import process is still running using background_import_still_running
3144 # *after* evaluating the test conditions.
3145 background_import_then_checkpoint () {
3146 options=$1
3147 input_file=$2
3148
3149 mkfifo V.input
3150 exec 8<>V.input
3151 rm V.input
3152
3153 mkfifo V.output
3154 exec 9<>V.output
3155 rm V.output
3156
3157 git fast-import $options <&8 >&9 &
3158 echo $! >V.pid
3159 # We don't mind if fast-import has already died by the time the test
3160 # ends.
3161 test_when_finished "exec 8>&-; exec 9>&-; kill $(cat V.pid) || true"
3162
3163 # Start in the background to ensure we adhere strictly to (blocking)
3164 # pipes writing sequence. We want to assume that the write below could
3165 # block, e.g. if fast-import blocks writing its own output to &9
3166 # because there is no reader on &9 yet.
3167 (
3168 cat "$input_file"
3169 echo "checkpoint"
3170 echo "progress checkpoint"
3171 ) >&8 &
3172
3173 error=1 ;# assume the worst
3174 while read output <&9
3175 do
3176 if test "$output" = "progress checkpoint"
3177 then
3178 error=0
3179 break
3180 fi
3181 # otherwise ignore cruft
3182 echo >&2 "cruft: $output"
3183 done
3184
3185 if test $error -eq 1
3186 then
3187 false
3188 fi
3189 }
3190
3191 background_import_still_running () {
3192 if ! kill -0 "$(cat V.pid)"
3193 then
3194 echo >&2 "background fast-import terminated too early"
3195 false
3196 fi
3197 }
3198
3199 test_expect_success PIPE 'V: checkpoint helper does not get stuck with extra output' '
3200 cat >input <<-INPUT_END &&
3201 progress foo
3202 progress bar
3203
3204 INPUT_END
3205
3206 background_import_then_checkpoint "" input &&
3207 background_import_still_running
3208 '
3209
3210 test_expect_success PIPE 'V: checkpoint updates refs after reset' '
3211 cat >input <<-\INPUT_END &&
3212 reset refs/heads/V
3213 from refs/heads/U
3214
3215 INPUT_END
3216
3217 background_import_then_checkpoint "" input &&
3218 test "$(git rev-parse --verify V)" = "$(git rev-parse --verify U)" &&
3219 background_import_still_running
3220 '
3221
3222 test_expect_success PIPE 'V: checkpoint updates refs and marks after commit' '
3223 cat >input <<-INPUT_END &&
3224 commit refs/heads/V
3225 mark :1
3226 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3227 data 0
3228 from refs/heads/U
3229
3230 INPUT_END
3231
3232 background_import_then_checkpoint "--export-marks=marks.actual" input &&
3233
3234 echo ":1 $(git rev-parse --verify V)" >marks.expected &&
3235
3236 test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify U)" &&
3237 test_cmp marks.expected marks.actual &&
3238 background_import_still_running
3239 '
3240
3241 # Re-create the exact same commit, but on a different branch: no new object is
3242 # created in the database, but the refs and marks still need to be updated.
3243 test_expect_success PIPE 'V: checkpoint updates refs and marks after commit (no new objects)' '
3244 cat >input <<-INPUT_END &&
3245 commit refs/heads/V2
3246 mark :2
3247 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3248 data 0
3249 from refs/heads/U
3250
3251 INPUT_END
3252
3253 background_import_then_checkpoint "--export-marks=marks.actual" input &&
3254
3255 echo ":2 $(git rev-parse --verify V2)" >marks.expected &&
3256
3257 test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" &&
3258 test_cmp marks.expected marks.actual &&
3259 background_import_still_running
3260 '
3261
3262 test_expect_success PIPE 'V: checkpoint updates tags after tag' '
3263 cat >input <<-INPUT_END &&
3264 tag Vtag
3265 from refs/heads/V
3266 tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
3267 data 0
3268
3269 INPUT_END
3270
3271 background_import_then_checkpoint "" input &&
3272 git show-ref -d Vtag &&
3273 background_import_still_running
3274 '
3275
3276 test_done
Unnamed repository; edit this file 'description' to name the repository.