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