Change remote tracking to remote-tracking in non-trivial places
[git/gitweb.git] / t / t9300-fast-import.sh
blob3c0cf0509d2cfe3afc0316ed50ea85cb0d2d14de
1 #!/bin/sh
3 # Copyright (c) 2007 Shawn Pearce
6 test_description='test git fast-import utility'
7 . ./test-lib.sh
8 . "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
10 file2_data='file2
11 second line of EOF'
13 file3_data='EOF
14 in 3rd file
15 END'
17 file4_data=abcd
18 file4_len=4
20 file5_data='an inline file.
21 we should see it later.'
23 file6_data='#!/bin/sh
24 echo "$@"'
26 ###
27 ### series A
28 ###
30 test_tick
31 cat >input <<INPUT_END
32 blob
33 mark :2
34 data <<EOF
35 $file2_data
36 EOF
38 blob
39 mark :3
40 data <<END
41 $file3_data
42 END
44 blob
45 mark :4
46 data $file4_len
47 $file4_data
48 commit refs/heads/master
49 mark :5
50 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
51 data <<COMMIT
52 initial
53 COMMIT
55 M 644 :2 file2
56 M 644 :3 file3
57 M 755 :4 file4
59 tag series-A
60 from :5
61 data <<EOF
62 An annotated tag without a tagger
63 EOF
65 INPUT_END
66 test_expect_success \
67 'A: create pack from stdin' \
68 'git fast-import --export-marks=marks.out <input &&
69 git whatchanged master'
70 test_expect_success \
71 'A: verify pack' \
72 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
74 cat >expect <<EOF
75 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
76 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
78 initial
79 EOF
80 test_expect_success \
81 'A: verify commit' \
82 'git cat-file commit master | sed 1d >actual &&
83 test_cmp expect actual'
85 cat >expect <<EOF
86 100644 blob file2
87 100644 blob file3
88 100755 blob file4
89 EOF
90 test_expect_success \
91 'A: verify tree' \
92 'git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
93 test_cmp expect actual'
95 echo "$file2_data" >expect
96 test_expect_success \
97 'A: verify file2' \
98 'git cat-file blob master:file2 >actual && test_cmp expect actual'
100 echo "$file3_data" >expect
101 test_expect_success \
102 'A: verify file3' \
103 'git cat-file blob master:file3 >actual && test_cmp expect actual'
105 printf "$file4_data" >expect
106 test_expect_success \
107 'A: verify file4' \
108 'git cat-file blob master:file4 >actual && test_cmp expect actual'
110 cat >expect <<EOF
111 object $(git rev-parse refs/heads/master)
112 type commit
113 tag series-A
115 An annotated tag without a tagger
117 test_expect_success 'A: verify tag/series-A' '
118 git cat-file tag tags/series-A >actual &&
119 test_cmp expect actual
122 cat >expect <<EOF
123 :2 `git rev-parse --verify master:file2`
124 :3 `git rev-parse --verify master:file3`
125 :4 `git rev-parse --verify master:file4`
126 :5 `git rev-parse --verify master^0`
128 test_expect_success \
129 'A: verify marks output' \
130 'test_cmp expect marks.out'
132 test_expect_success \
133 'A: verify marks import' \
134 'git fast-import \
135 --import-marks=marks.out \
136 --export-marks=marks.new \
137 </dev/null &&
138 test_cmp expect marks.new'
140 test_tick
141 cat >input <<INPUT_END
142 commit refs/heads/verify--import-marks
143 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
144 data <<COMMIT
145 recreate from :5
146 COMMIT
148 from :5
149 M 755 :2 copy-of-file2
151 INPUT_END
152 test_expect_success \
153 'A: verify marks import does not crash' \
154 'git fast-import --import-marks=marks.out <input &&
155 git whatchanged verify--import-marks'
156 test_expect_success \
157 'A: verify pack' \
158 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
159 cat >expect <<EOF
160 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
162 git diff-tree -M -r master verify--import-marks >actual
163 test_expect_success \
164 'A: verify diff' \
165 'compare_diff_raw expect actual &&
166 test `git rev-parse --verify master:file2` \
167 = `git rev-parse --verify verify--import-marks:copy-of-file2`'
169 test_tick
170 mt=$(git hash-object --stdin < /dev/null)
171 : >input.blob
172 : >marks.exp
173 : >tree.exp
175 cat >input.commit <<EOF
176 commit refs/heads/verify--dump-marks
177 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
178 data <<COMMIT
179 test the sparse array dumping routines with exponentially growing marks
180 COMMIT
187 while test "$i" -lt 27; do
188 cat >>input.blob <<EOF
189 blob
190 mark :$l
191 data 0
192 blob
193 mark :$m
194 data 0
195 blob
196 mark :$n
197 data 0
199 echo "M 100644 :$l l$i" >>input.commit
200 echo "M 100644 :$m m$i" >>input.commit
201 echo "M 100644 :$n n$i" >>input.commit
203 echo ":$l $mt" >>marks.exp
204 echo ":$m $mt" >>marks.exp
205 echo ":$n $mt" >>marks.exp
207 printf "100644 blob $mt\tl$i\n" >>tree.exp
208 printf "100644 blob $mt\tm$i\n" >>tree.exp
209 printf "100644 blob $mt\tn$i\n" >>tree.exp
211 l=$(($l + $l))
212 m=$(($m + $m))
213 n=$(($l + $n))
215 i=$((1 + $i))
216 done
218 sort tree.exp > tree.exp_s
220 test_expect_success 'A: export marks with large values' '
221 cat input.blob input.commit | git fast-import --export-marks=marks.large &&
222 git ls-tree refs/heads/verify--dump-marks >tree.out &&
223 test_cmp tree.exp_s tree.out &&
224 test_cmp marks.exp marks.large'
227 ### series B
230 test_tick
231 cat >input <<INPUT_END
232 commit refs/heads/branch
233 mark :1
234 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
235 data <<COMMIT
236 corrupt
237 COMMIT
239 from refs/heads/master
240 M 755 0000000000000000000000000000000000000001 zero1
242 INPUT_END
243 test_expect_success 'B: fail on invalid blob sha1' '
244 test_must_fail git fast-import <input
246 rm -f .git/objects/pack_* .git/objects/index_*
248 cat >input <<INPUT_END
249 commit .badbranchname
250 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
251 data <<COMMIT
252 corrupt
253 COMMIT
255 from refs/heads/master
257 INPUT_END
258 test_expect_success 'B: fail on invalid branch name ".badbranchname"' '
259 test_must_fail git fast-import <input
261 rm -f .git/objects/pack_* .git/objects/index_*
263 cat >input <<INPUT_END
264 commit bad[branch]name
265 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
266 data <<COMMIT
267 corrupt
268 COMMIT
270 from refs/heads/master
272 INPUT_END
273 test_expect_success 'B: fail on invalid branch name "bad[branch]name"' '
274 test_must_fail git fast-import <input
276 rm -f .git/objects/pack_* .git/objects/index_*
278 cat >input <<INPUT_END
279 commit TEMP_TAG
280 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
281 data <<COMMIT
282 tag base
283 COMMIT
285 from refs/heads/master
287 INPUT_END
288 test_expect_success \
289 'B: accept branch name "TEMP_TAG"' \
290 'git fast-import <input &&
291 test -f .git/TEMP_TAG &&
292 test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
293 rm -f .git/TEMP_TAG
296 ### series C
299 newf=`echo hi newf | git hash-object -w --stdin`
300 oldf=`git rev-parse --verify master:file2`
301 test_tick
302 cat >input <<INPUT_END
303 commit refs/heads/branch
304 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
305 data <<COMMIT
306 second
307 COMMIT
309 from refs/heads/master
310 M 644 $oldf file2/oldf
311 M 755 $newf file2/newf
312 D file3
314 INPUT_END
315 test_expect_success \
316 'C: incremental import create pack from stdin' \
317 'git fast-import <input &&
318 git whatchanged branch'
319 test_expect_success \
320 'C: verify pack' \
321 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
322 test_expect_success \
323 'C: validate reuse existing blob' \
324 'test $newf = `git rev-parse --verify branch:file2/newf`
325 test $oldf = `git rev-parse --verify branch:file2/oldf`'
327 cat >expect <<EOF
328 parent `git rev-parse --verify master^0`
329 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
330 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
332 second
334 test_expect_success \
335 'C: verify commit' \
336 'git cat-file commit branch | sed 1d >actual &&
337 test_cmp expect actual'
339 cat >expect <<EOF
340 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
341 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
342 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
344 git diff-tree -M -r master branch >actual
345 test_expect_success \
346 'C: validate rename result' \
347 'compare_diff_raw expect actual'
350 ### series D
353 test_tick
354 cat >input <<INPUT_END
355 commit refs/heads/branch
356 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
357 data <<COMMIT
358 third
359 COMMIT
361 from refs/heads/branch^0
362 M 644 inline newdir/interesting
363 data <<EOF
364 $file5_data
367 M 755 inline newdir/exec.sh
368 data <<EOF
369 $file6_data
372 INPUT_END
373 test_expect_success \
374 'D: inline data in commit' \
375 'git fast-import <input &&
376 git whatchanged branch'
377 test_expect_success \
378 'D: verify pack' \
379 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
381 cat >expect <<EOF
382 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
383 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
385 git diff-tree -M -r branch^ branch >actual
386 test_expect_success \
387 'D: validate new files added' \
388 'compare_diff_raw expect actual'
390 echo "$file5_data" >expect
391 test_expect_success \
392 'D: verify file5' \
393 'git cat-file blob branch:newdir/interesting >actual &&
394 test_cmp expect actual'
396 echo "$file6_data" >expect
397 test_expect_success \
398 'D: verify file6' \
399 'git cat-file blob branch:newdir/exec.sh >actual &&
400 test_cmp expect actual'
403 ### series E
406 cat >input <<INPUT_END
407 commit refs/heads/branch
408 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
409 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
410 data <<COMMIT
411 RFC 2822 type date
412 COMMIT
414 from refs/heads/branch^0
416 INPUT_END
417 test_expect_success 'E: rfc2822 date, --date-format=raw' '
418 test_must_fail git fast-import --date-format=raw <input
420 test_expect_success \
421 'E: rfc2822 date, --date-format=rfc2822' \
422 'git fast-import --date-format=rfc2822 <input'
423 test_expect_success \
424 'E: verify pack' \
425 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
427 cat >expect <<EOF
428 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
429 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
431 RFC 2822 type date
433 test_expect_success \
434 'E: verify commit' \
435 'git cat-file commit branch | sed 1,2d >actual &&
436 test_cmp expect actual'
439 ### series F
442 old_branch=`git rev-parse --verify branch^0`
443 test_tick
444 cat >input <<INPUT_END
445 commit refs/heads/branch
446 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
447 data <<COMMIT
448 losing things already?
449 COMMIT
451 from refs/heads/branch~1
453 reset refs/heads/other
454 from refs/heads/branch
456 INPUT_END
457 test_expect_success \
458 'F: non-fast-forward update skips' \
459 'if git fast-import <input
460 then
461 echo BAD gfi did not fail
462 return 1
463 else
464 if test $old_branch = `git rev-parse --verify branch^0`
465 then
466 : branch unaffected and failure returned
467 return 0
468 else
469 echo BAD gfi changed branch $old_branch
470 return 1
474 test_expect_success \
475 'F: verify pack' \
476 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
478 cat >expect <<EOF
479 tree `git rev-parse branch~1^{tree}`
480 parent `git rev-parse branch~1`
481 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
482 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
484 losing things already?
486 test_expect_success \
487 'F: verify other commit' \
488 'git cat-file commit other >actual &&
489 test_cmp expect actual'
492 ### series G
495 old_branch=`git rev-parse --verify branch^0`
496 test_tick
497 cat >input <<INPUT_END
498 commit refs/heads/branch
499 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
500 data <<COMMIT
501 losing things already?
502 COMMIT
504 from refs/heads/branch~1
506 INPUT_END
507 test_expect_success \
508 'G: non-fast-forward update forced' \
509 'git fast-import --force <input'
510 test_expect_success \
511 'G: verify pack' \
512 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
513 test_expect_success \
514 'G: branch changed, but logged' \
515 'test $old_branch != `git rev-parse --verify branch^0` &&
516 test $old_branch = `git rev-parse --verify branch@{1}`'
519 ### series H
522 test_tick
523 cat >input <<INPUT_END
524 commit refs/heads/H
525 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
526 data <<COMMIT
527 third
528 COMMIT
530 from refs/heads/branch^0
531 M 644 inline i-will-die
532 data <<EOF
533 this file will never exist.
536 deleteall
537 M 644 inline h/e/l/lo
538 data <<EOF
539 $file5_data
542 INPUT_END
543 test_expect_success \
544 'H: deletall, add 1' \
545 'git fast-import <input &&
546 git whatchanged H'
547 test_expect_success \
548 'H: verify pack' \
549 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
551 cat >expect <<EOF
552 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
553 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
554 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
555 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
556 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
558 git diff-tree -M -r H^ H >actual
559 test_expect_success \
560 'H: validate old files removed, new files added' \
561 'compare_diff_raw expect actual'
563 echo "$file5_data" >expect
564 test_expect_success \
565 'H: verify file' \
566 'git cat-file blob H:h/e/l/lo >actual &&
567 test_cmp expect actual'
570 ### series I
573 cat >input <<INPUT_END
574 commit refs/heads/export-boundary
575 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
576 data <<COMMIT
577 we have a border. its only 40 characters wide.
578 COMMIT
580 from refs/heads/branch
582 INPUT_END
583 test_expect_success \
584 'I: export-pack-edges' \
585 'git fast-import --export-pack-edges=edges.list <input'
587 cat >expect <<EOF
588 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
590 test_expect_success \
591 'I: verify edge list' \
592 'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
593 test_cmp expect actual'
596 ### series J
599 cat >input <<INPUT_END
600 commit refs/heads/J
601 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
602 data <<COMMIT
603 create J
604 COMMIT
606 from refs/heads/branch
608 reset refs/heads/J
610 commit refs/heads/J
611 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
612 data <<COMMIT
613 initialize J
614 COMMIT
616 INPUT_END
617 test_expect_success \
618 'J: reset existing branch creates empty commit' \
619 'git fast-import <input'
620 test_expect_success \
621 'J: branch has 1 commit, empty tree' \
622 'test 1 = `git rev-list J | wc -l` &&
623 test 0 = `git ls-tree J | wc -l`'
626 ### series K
629 cat >input <<INPUT_END
630 commit refs/heads/K
631 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
632 data <<COMMIT
633 create K
634 COMMIT
636 from refs/heads/branch
638 commit refs/heads/K
639 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
640 data <<COMMIT
641 redo K
642 COMMIT
644 from refs/heads/branch^1
646 INPUT_END
647 test_expect_success \
648 'K: reinit branch with from' \
649 'git fast-import <input'
650 test_expect_success \
651 'K: verify K^1 = branch^1' \
652 'test `git rev-parse --verify branch^1` \
653 = `git rev-parse --verify K^1`'
656 ### series L
659 cat >input <<INPUT_END
660 blob
661 mark :1
662 data <<EOF
663 some data
666 blob
667 mark :2
668 data <<EOF
669 other data
672 commit refs/heads/L
673 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
674 data <<COMMIT
675 create L
676 COMMIT
678 M 644 :1 b.
679 M 644 :1 b/other
680 M 644 :1 ba
682 commit refs/heads/L
683 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
684 data <<COMMIT
685 update L
686 COMMIT
688 M 644 :2 b.
689 M 644 :2 b/other
690 M 644 :2 ba
691 INPUT_END
693 cat >expect <<EXPECT_END
694 :100644 100644 4268632... 55d3a52... M b.
695 :040000 040000 0ae5cac... 443c768... M b
696 :100644 100644 4268632... 55d3a52... M ba
697 EXPECT_END
699 test_expect_success \
700 'L: verify internal tree sorting' \
701 'git fast-import <input &&
702 git diff-tree --abbrev --raw L^ L >output &&
703 test_cmp expect output'
706 ### series M
709 test_tick
710 cat >input <<INPUT_END
711 commit refs/heads/M1
712 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
713 data <<COMMIT
714 file rename
715 COMMIT
717 from refs/heads/branch^0
718 R file2/newf file2/n.e.w.f
720 INPUT_END
722 cat >expect <<EOF
723 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
725 test_expect_success \
726 'M: rename file in same subdirectory' \
727 'git fast-import <input &&
728 git diff-tree -M -r M1^ M1 >actual &&
729 compare_diff_raw expect actual'
731 cat >input <<INPUT_END
732 commit refs/heads/M2
733 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
734 data <<COMMIT
735 file rename
736 COMMIT
738 from refs/heads/branch^0
739 R file2/newf i/am/new/to/you
741 INPUT_END
743 cat >expect <<EOF
744 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
746 test_expect_success \
747 'M: rename file to new subdirectory' \
748 'git fast-import <input &&
749 git diff-tree -M -r M2^ M2 >actual &&
750 compare_diff_raw expect actual'
752 cat >input <<INPUT_END
753 commit refs/heads/M3
754 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
755 data <<COMMIT
756 file rename
757 COMMIT
759 from refs/heads/M2^0
760 R i other/sub
762 INPUT_END
764 cat >expect <<EOF
765 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
767 test_expect_success \
768 'M: rename subdirectory to new subdirectory' \
769 'git fast-import <input &&
770 git diff-tree -M -r M3^ M3 >actual &&
771 compare_diff_raw expect actual'
774 ### series N
777 test_tick
778 cat >input <<INPUT_END
779 commit refs/heads/N1
780 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
781 data <<COMMIT
782 file copy
783 COMMIT
785 from refs/heads/branch^0
786 C file2/newf file2/n.e.w.f
788 INPUT_END
790 cat >expect <<EOF
791 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
793 test_expect_success \
794 'N: copy file in same subdirectory' \
795 'git fast-import <input &&
796 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
797 compare_diff_raw expect actual'
799 cat >input <<INPUT_END
800 commit refs/heads/N2
801 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
802 data <<COMMIT
803 clean directory copy
804 COMMIT
806 from refs/heads/branch^0
807 C file2 file3
809 commit refs/heads/N2
810 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
811 data <<COMMIT
812 modify directory copy
813 COMMIT
815 M 644 inline file3/file5
816 data <<EOF
817 $file5_data
820 INPUT_END
822 cat >expect <<EOF
823 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
824 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
825 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
827 test_expect_success \
828 'N: copy then modify subdirectory' \
829 'git fast-import <input &&
830 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
831 compare_diff_raw expect actual'
833 cat >input <<INPUT_END
834 commit refs/heads/N3
835 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
836 data <<COMMIT
837 dirty directory copy
838 COMMIT
840 from refs/heads/branch^0
841 M 644 inline file2/file5
842 data <<EOF
843 $file5_data
846 C file2 file3
847 D file2/file5
849 INPUT_END
851 test_expect_success \
852 'N: copy dirty subdirectory' \
853 'git fast-import <input &&
854 test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
856 test_expect_success \
857 'N: copy directory by id' \
858 'cat >expect <<-\EOF &&
859 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
860 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
862 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
863 cat >input <<-INPUT_END &&
864 commit refs/heads/N4
865 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
866 data <<COMMIT
867 copy by tree hash
868 COMMIT
870 from refs/heads/branch^0
871 M 040000 $subdir file3
872 INPUT_END
873 git fast-import <input &&
874 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
875 compare_diff_raw expect actual'
877 test_expect_success \
878 'N: copy root directory by tree hash' \
879 'cat >expect <<-\EOF &&
880 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf
881 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf
883 root=$(git rev-parse refs/heads/branch^0^{tree}) &&
884 cat >input <<-INPUT_END &&
885 commit refs/heads/N6
886 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
887 data <<COMMIT
888 copy root directory by tree hash
889 COMMIT
891 from refs/heads/branch^0
892 M 040000 $root ""
893 INPUT_END
894 git fast-import <input &&
895 git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
896 compare_diff_raw expect actual'
898 test_expect_success \
899 'N: modify copied tree' \
900 'cat >expect <<-\EOF &&
901 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
902 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
903 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
905 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
906 cat >input <<-INPUT_END &&
907 commit refs/heads/N5
908 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
909 data <<COMMIT
910 copy by tree hash
911 COMMIT
913 from refs/heads/branch^0
914 M 040000 $subdir file3
916 commit refs/heads/N5
917 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
918 data <<COMMIT
919 modify directory copy
920 COMMIT
922 M 644 inline file3/file5
923 data <<EOF
924 $file5_data
926 INPUT_END
927 git fast-import <input &&
928 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
929 compare_diff_raw expect actual'
932 ### series O
935 cat >input <<INPUT_END
936 #we will
937 commit refs/heads/O1
938 # -- ignore all of this text
939 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
940 # $GIT_COMMITTER_NAME has inserted here for his benefit.
941 data <<COMMIT
942 dirty directory copy
943 COMMIT
945 # don't forget the import blank line!
947 # yes, we started from our usual base of branch^0.
948 # i like branch^0.
949 from refs/heads/branch^0
950 # and we need to reuse file2/file5 from N3 above.
951 M 644 inline file2/file5
952 # otherwise the tree will be different
953 data <<EOF
954 $file5_data
957 # don't forget to copy file2 to file3
958 C file2 file3
960 # or to delete file5 from file2.
961 D file2/file5
962 # are we done yet?
964 INPUT_END
966 test_expect_success \
967 'O: comments are all skipped' \
968 'git fast-import <input &&
969 test `git rev-parse N3` = `git rev-parse O1`'
971 cat >input <<INPUT_END
972 commit refs/heads/O2
973 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
974 data <<COMMIT
975 dirty directory copy
976 COMMIT
977 from refs/heads/branch^0
978 M 644 inline file2/file5
979 data <<EOF
980 $file5_data
982 C file2 file3
983 D file2/file5
985 INPUT_END
987 test_expect_success \
988 'O: blank lines not necessary after data commands' \
989 'git fast-import <input &&
990 test `git rev-parse N3` = `git rev-parse O2`'
992 test_expect_success \
993 'O: repack before next test' \
994 'git repack -a -d'
996 cat >input <<INPUT_END
997 commit refs/heads/O3
998 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
999 data <<COMMIT
1000 zstring
1001 COMMIT
1002 commit refs/heads/O3
1003 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1004 data <<COMMIT
1006 COMMIT
1007 checkpoint
1008 commit refs/heads/O3
1009 mark :5
1010 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1011 data <<COMMIT
1012 zempty
1013 COMMIT
1014 checkpoint
1015 commit refs/heads/O3
1016 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1017 data <<COMMIT
1018 zcommits
1019 COMMIT
1020 reset refs/tags/O3-2nd
1021 from :5
1022 reset refs/tags/O3-3rd
1023 from :5
1024 INPUT_END
1026 cat >expect <<INPUT_END
1027 string
1029 empty
1030 commits
1031 INPUT_END
1032 test_expect_success \
1033 'O: blank lines not necessary after other commands' \
1034 'git fast-import <input &&
1035 test 8 = `find .git/objects/pack -type f | wc -l` &&
1036 test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1037 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1038 test_cmp expect actual'
1040 cat >input <<INPUT_END
1041 commit refs/heads/O4
1042 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1043 data <<COMMIT
1044 zstring
1045 COMMIT
1046 commit refs/heads/O4
1047 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1048 data <<COMMIT
1050 COMMIT
1051 progress Two commits down, 2 to go!
1052 commit refs/heads/O4
1053 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1054 data <<COMMIT
1055 zempty
1056 COMMIT
1057 progress Three commits down, 1 to go!
1058 commit refs/heads/O4
1059 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1060 data <<COMMIT
1061 zcommits
1062 COMMIT
1063 progress I'm done!
1064 INPUT_END
1065 test_expect_success \
1066 'O: progress outputs as requested by input' \
1067 'git fast-import <input >actual &&
1068 grep "progress " <input >expect &&
1069 test_cmp expect actual'
1072 ### series P (gitlinks)
1075 cat >input <<INPUT_END
1076 blob
1077 mark :1
1078 data 10
1079 test file
1081 reset refs/heads/sub
1082 commit refs/heads/sub
1083 mark :2
1084 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1085 data 12
1086 sub_initial
1087 M 100644 :1 file
1089 blob
1090 mark :3
1091 data <<DATAEND
1092 [submodule "sub"]
1093 path = sub
1094 url = "`pwd`/sub"
1095 DATAEND
1097 commit refs/heads/subuse1
1098 mark :4
1099 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1100 data 8
1101 initial
1102 from refs/heads/master
1103 M 100644 :3 .gitmodules
1104 M 160000 :2 sub
1106 blob
1107 mark :5
1108 data 20
1109 test file
1110 more data
1112 commit refs/heads/sub
1113 mark :6
1114 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1115 data 11
1116 sub_second
1117 from :2
1118 M 100644 :5 file
1120 commit refs/heads/subuse1
1121 mark :7
1122 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1123 data 7
1124 second
1125 from :4
1126 M 160000 :6 sub
1128 INPUT_END
1130 test_expect_success \
1131 'P: supermodule & submodule mix' \
1132 'git fast-import <input &&
1133 git checkout subuse1 &&
1134 rm -rf sub && mkdir sub && (cd sub &&
1135 git init &&
1136 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1137 git checkout master) &&
1138 git submodule init &&
1139 git submodule update'
1141 SUBLAST=$(git rev-parse --verify sub)
1142 SUBPREV=$(git rev-parse --verify sub^)
1144 cat >input <<INPUT_END
1145 blob
1146 mark :1
1147 data <<DATAEND
1148 [submodule "sub"]
1149 path = sub
1150 url = "`pwd`/sub"
1151 DATAEND
1153 commit refs/heads/subuse2
1154 mark :2
1155 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1156 data 8
1157 initial
1158 from refs/heads/master
1159 M 100644 :1 .gitmodules
1160 M 160000 $SUBPREV sub
1162 commit refs/heads/subuse2
1163 mark :3
1164 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1165 data 7
1166 second
1167 from :2
1168 M 160000 $SUBLAST sub
1170 INPUT_END
1172 test_expect_success \
1173 'P: verbatim SHA gitlinks' \
1174 'git branch -D sub &&
1175 git gc && git prune &&
1176 git fast-import <input &&
1177 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1179 test_tick
1180 cat >input <<INPUT_END
1181 commit refs/heads/subuse3
1182 mark :1
1183 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1184 data <<COMMIT
1185 corrupt
1186 COMMIT
1188 from refs/heads/subuse2
1189 M 160000 inline sub
1190 data <<DATA
1191 $SUBPREV
1192 DATA
1194 INPUT_END
1196 test_expect_success 'P: fail on inline gitlink' '
1197 test_must_fail git fast-import <input'
1199 test_tick
1200 cat >input <<INPUT_END
1201 blob
1202 mark :1
1203 data <<DATA
1204 $SUBPREV
1205 DATA
1207 commit refs/heads/subuse3
1208 mark :2
1209 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1210 data <<COMMIT
1211 corrupt
1212 COMMIT
1214 from refs/heads/subuse2
1215 M 160000 :1 sub
1217 INPUT_END
1219 test_expect_success 'P: fail on blob mark in gitlink' '
1220 test_must_fail git fast-import <input'
1223 ### series Q (notes)
1226 note1_data="The first note for the first commit"
1227 note2_data="The first note for the second commit"
1228 note3_data="The first note for the third commit"
1229 note1b_data="The second note for the first commit"
1230 note1c_data="The third note for the first commit"
1231 note2b_data="The second note for the second commit"
1233 test_tick
1234 cat >input <<INPUT_END
1235 blob
1236 mark :2
1237 data <<EOF
1238 $file2_data
1241 commit refs/heads/notes-test
1242 mark :3
1243 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1244 data <<COMMIT
1245 first (:3)
1246 COMMIT
1248 M 644 :2 file2
1250 blob
1251 mark :4
1252 data $file4_len
1253 $file4_data
1254 commit refs/heads/notes-test
1255 mark :5
1256 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1257 data <<COMMIT
1258 second (:5)
1259 COMMIT
1261 M 644 :4 file4
1263 commit refs/heads/notes-test
1264 mark :6
1265 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1266 data <<COMMIT
1267 third (:6)
1268 COMMIT
1270 M 644 inline file5
1271 data <<EOF
1272 $file5_data
1275 M 755 inline file6
1276 data <<EOF
1277 $file6_data
1280 blob
1281 mark :7
1282 data <<EOF
1283 $note1_data
1286 blob
1287 mark :8
1288 data <<EOF
1289 $note2_data
1292 commit refs/notes/foobar
1293 mark :9
1294 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1295 data <<COMMIT
1296 notes (:9)
1297 COMMIT
1299 N :7 :3
1300 N :8 :5
1301 N inline :6
1302 data <<EOF
1303 $note3_data
1306 commit refs/notes/foobar
1307 mark :10
1308 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1309 data <<COMMIT
1310 notes (:10)
1311 COMMIT
1313 N inline :3
1314 data <<EOF
1315 $note1b_data
1318 commit refs/notes/foobar2
1319 mark :11
1320 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1321 data <<COMMIT
1322 notes (:11)
1323 COMMIT
1325 N inline :3
1326 data <<EOF
1327 $note1c_data
1330 commit refs/notes/foobar
1331 mark :12
1332 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1333 data <<COMMIT
1334 notes (:12)
1335 COMMIT
1337 deleteall
1338 N inline :5
1339 data <<EOF
1340 $note2b_data
1343 INPUT_END
1345 test_expect_success \
1346 'Q: commit notes' \
1347 'git fast-import <input &&
1348 git whatchanged notes-test'
1349 test_expect_success \
1350 'Q: verify pack' \
1351 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1353 commit1=$(git rev-parse notes-test~2)
1354 commit2=$(git rev-parse notes-test^)
1355 commit3=$(git rev-parse notes-test)
1357 cat >expect <<EOF
1358 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1359 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1361 first (:3)
1363 test_expect_success \
1364 'Q: verify first commit' \
1365 'git cat-file commit notes-test~2 | sed 1d >actual &&
1366 test_cmp expect actual'
1368 cat >expect <<EOF
1369 parent $commit1
1370 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1371 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1373 second (:5)
1375 test_expect_success \
1376 'Q: verify second commit' \
1377 'git cat-file commit notes-test^ | sed 1d >actual &&
1378 test_cmp expect actual'
1380 cat >expect <<EOF
1381 parent $commit2
1382 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1383 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1385 third (:6)
1387 test_expect_success \
1388 'Q: verify third commit' \
1389 'git cat-file commit notes-test | sed 1d >actual &&
1390 test_cmp expect actual'
1392 cat >expect <<EOF
1393 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1394 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1396 notes (:9)
1398 test_expect_success \
1399 'Q: verify first notes commit' \
1400 'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1401 test_cmp expect actual'
1403 cat >expect.unsorted <<EOF
1404 100644 blob $commit1
1405 100644 blob $commit2
1406 100644 blob $commit3
1408 cat expect.unsorted | sort >expect
1409 test_expect_success \
1410 'Q: verify first notes tree' \
1411 'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1412 test_cmp expect actual'
1414 echo "$note1_data" >expect
1415 test_expect_success \
1416 'Q: verify first note for first commit' \
1417 'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1419 echo "$note2_data" >expect
1420 test_expect_success \
1421 'Q: verify first note for second commit' \
1422 'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1424 echo "$note3_data" >expect
1425 test_expect_success \
1426 'Q: verify first note for third commit' \
1427 'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1429 cat >expect <<EOF
1430 parent `git rev-parse --verify refs/notes/foobar~2`
1431 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1432 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1434 notes (:10)
1436 test_expect_success \
1437 'Q: verify second notes commit' \
1438 'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1439 test_cmp expect actual'
1441 cat >expect.unsorted <<EOF
1442 100644 blob $commit1
1443 100644 blob $commit2
1444 100644 blob $commit3
1446 cat expect.unsorted | sort >expect
1447 test_expect_success \
1448 'Q: verify second notes tree' \
1449 'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1450 test_cmp expect actual'
1452 echo "$note1b_data" >expect
1453 test_expect_success \
1454 'Q: verify second note for first commit' \
1455 'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1457 echo "$note2_data" >expect
1458 test_expect_success \
1459 'Q: verify first note for second commit' \
1460 'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1462 echo "$note3_data" >expect
1463 test_expect_success \
1464 'Q: verify first note for third commit' \
1465 'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1467 cat >expect <<EOF
1468 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1469 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1471 notes (:11)
1473 test_expect_success \
1474 'Q: verify third notes commit' \
1475 'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1476 test_cmp expect actual'
1478 cat >expect.unsorted <<EOF
1479 100644 blob $commit1
1481 cat expect.unsorted | sort >expect
1482 test_expect_success \
1483 'Q: verify third notes tree' \
1484 'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1485 test_cmp expect actual'
1487 echo "$note1c_data" >expect
1488 test_expect_success \
1489 'Q: verify third note for first commit' \
1490 'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1492 cat >expect <<EOF
1493 parent `git rev-parse --verify refs/notes/foobar^`
1494 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1495 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1497 notes (:12)
1499 test_expect_success \
1500 'Q: verify fourth notes commit' \
1501 'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1502 test_cmp expect actual'
1504 cat >expect.unsorted <<EOF
1505 100644 blob $commit2
1507 cat expect.unsorted | sort >expect
1508 test_expect_success \
1509 'Q: verify fourth notes tree' \
1510 'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1511 test_cmp expect actual'
1513 echo "$note2b_data" >expect
1514 test_expect_success \
1515 'Q: verify second note for second commit' \
1516 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1519 ### series R (feature and option)
1522 cat >input <<EOF
1523 feature no-such-feature-exists
1526 test_expect_success 'R: abort on unsupported feature' '
1527 test_must_fail git fast-import <input
1530 cat >input <<EOF
1531 feature date-format=now
1534 test_expect_success 'R: supported feature is accepted' '
1535 git fast-import <input
1538 cat >input << EOF
1539 blob
1540 data 3
1542 feature date-format=now
1545 test_expect_success 'R: abort on receiving feature after data command' '
1546 test_must_fail git fast-import <input
1549 cat >input << EOF
1550 feature import-marks=git.marks
1551 feature import-marks=git2.marks
1554 test_expect_success 'R: only one import-marks feature allowed per stream' '
1555 test_must_fail git fast-import <input
1558 cat >input << EOF
1559 feature export-marks=git.marks
1560 blob
1561 mark :1
1562 data 3
1567 test_expect_success \
1568 'R: export-marks feature results in a marks file being created' \
1569 'cat input | git fast-import &&
1570 grep :1 git.marks'
1572 test_expect_success \
1573 'R: export-marks options can be overriden by commandline options' \
1574 'cat input | git fast-import --export-marks=other.marks &&
1575 grep :1 other.marks'
1577 cat >input << EOF
1578 feature import-marks=marks.out
1579 feature export-marks=marks.new
1582 test_expect_success \
1583 'R: import to output marks works without any content' \
1584 'cat input | git fast-import &&
1585 test_cmp marks.out marks.new'
1587 cat >input <<EOF
1588 feature import-marks=nonexistant.marks
1589 feature export-marks=marks.new
1592 test_expect_success \
1593 'R: import marks prefers commandline marks file over the stream' \
1594 'cat input | git fast-import --import-marks=marks.out &&
1595 test_cmp marks.out marks.new'
1598 cat >input <<EOF
1599 feature import-marks=nonexistant.marks
1600 feature export-marks=combined.marks
1603 test_expect_success 'R: multiple --import-marks= should be honoured' '
1604 head -n2 marks.out > one.marks &&
1605 tail -n +3 marks.out > two.marks &&
1606 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1607 test_cmp marks.out combined.marks
1610 cat >input <<EOF
1611 feature relative-marks
1612 feature import-marks=relative.in
1613 feature export-marks=relative.out
1616 test_expect_success 'R: feature relative-marks should be honoured' '
1617 mkdir -p .git/info/fast-import/ &&
1618 cp marks.new .git/info/fast-import/relative.in &&
1619 git fast-import <input &&
1620 test_cmp marks.new .git/info/fast-import/relative.out
1623 cat >input <<EOF
1624 feature relative-marks
1625 feature import-marks=relative.in
1626 feature no-relative-marks
1627 feature export-marks=non-relative.out
1630 test_expect_success 'R: feature no-relative-marks should be honoured' '
1631 git fast-import <input &&
1632 test_cmp marks.new non-relative.out
1635 cat >input << EOF
1636 option git quiet
1637 blob
1638 data 3
1643 touch empty
1645 test_expect_success 'R: quiet option results in no stats being output' '
1646 cat input | git fast-import 2> output &&
1647 test_cmp empty output
1650 cat >input <<EOF
1651 option git non-existing-option
1654 test_expect_success 'R: die on unknown option' '
1655 test_must_fail git fast-import <input
1658 test_expect_success 'R: unknown commandline options are rejected' '\
1659 test_must_fail git fast-import --non-existing-option < /dev/null
1662 cat >input <<EOF
1663 option non-existing-vcs non-existing-option
1666 test_expect_success 'R: ignore non-git options' '
1667 git fast-import <input
1671 ## R: very large blobs
1673 blobsize=$((2*1024*1024 + 53))
1674 test-genrandom bar $blobsize >expect
1675 cat >input <<INPUT_END
1676 commit refs/heads/big-file
1677 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1678 data <<COMMIT
1679 R - big file
1680 COMMIT
1682 M 644 inline big1
1683 data $blobsize
1684 INPUT_END
1685 cat expect >>input
1686 cat >>input <<INPUT_END
1687 M 644 inline big2
1688 data $blobsize
1689 INPUT_END
1690 cat expect >>input
1691 echo >>input
1693 test_expect_success \
1694 'R: blob bigger than threshold' \
1695 'test_create_repo R &&
1696 git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
1697 test_expect_success \
1698 'R: verify created pack' \
1699 ': >verify &&
1700 for p in R/.git/objects/pack/*.pack;
1702 git verify-pack -v $p >>verify || exit;
1703 done'
1704 test_expect_success \
1705 'R: verify written objects' \
1706 'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
1707 test_cmp expect actual &&
1708 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
1709 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
1710 test $a = $b'
1711 test_expect_success \
1712 'R: blob appears only once' \
1713 'n=$(grep $a verify | wc -l) &&
1714 test 1 = $n'
1716 test_done