3 # Copyright (c) 2007 Shawn Pearce
6 test_description
='test git fast-import utility'
8 .
"$TEST_DIRECTORY"/diff-lib.sh
;# test-lib chdir's into trash
20 file5_data
='an inline file.
21 we should see it later.'
31 cat >input
<<INPUT_END
48 commit refs/heads/master
50 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
62 An annotated tag without a tagger
67 'A: create pack from stdin' \
68 'git fast-import --export-marks=marks.out <input &&
69 git whatchanged master'
72 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
75 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
76 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
82 'git cat-file commit master | sed 1d >actual &&
83 test_cmp expect actual'
92 'git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
93 test_cmp expect actual'
95 echo "$file2_data" >expect
98 'git cat-file blob master:file2 >actual && test_cmp expect actual'
100 echo "$file3_data" >expect
101 test_expect_success \
103 'git cat-file blob master:file3 >actual && test_cmp expect actual'
105 printf "$file4_data" >expect
106 test_expect_success \
108 'git cat-file blob master:file4 >actual && test_cmp expect actual'
111 object $(git rev-parse refs/heads/master)
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
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' \
135 --import-marks=marks.out \
136 --export-marks=marks.new \
138 test_cmp expect marks.new'
141 cat >input
<<INPUT_END
142 commit refs/heads/verify--import-marks
143 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
149 M 755 :2 copy-of-file2
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 \
158 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
160 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
162 git diff-tree
-M -r master verify--import-marks
>actual
163 test_expect_success \
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`'
170 mt
=$
(git hash-object
--stdin < /dev
/null
)
175 cat >input.commit
<<EOF
176 commit refs/heads/verify--dump-marks
177 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
179 test the sparse array dumping routines with exponentially growing marks
187 while test "$i" -lt 27; do
188 cat >>input.blob
<<EOF
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
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'
231 cat >input
<<INPUT_END
232 commit refs/heads/branch
234 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
239 from refs/heads/master
240 M 755 0000000000000000000000000000000000000001 zero1
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
255 from refs/heads/master
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
270 from refs/heads/master
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
280 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
285 from refs/heads/master
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^`'
299 newf
=`echo hi newf | git hash-object -w --stdin`
300 oldf
=`git rev-parse --verify master:file2`
302 cat >input
<<INPUT_END
303 commit refs/heads/branch
304 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
309 from refs/heads/master
310 M 644 $oldf file2/oldf
311 M 755 $newf file2/newf
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 \
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`'
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
334 test_expect_success \
336 'git cat-file commit branch | sed 1d >actual &&
337 test_cmp expect actual'
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'
354 cat >input
<<INPUT_END
355 commit refs/heads/branch
356 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
361 from refs/heads/branch^0
362 M 644 inline newdir/interesting
367 M 755 inline newdir/exec.sh
373 test_expect_success \
374 'D: inline data in commit' \
375 'git fast-import <input &&
376 git whatchanged branch'
377 test_expect_success \
379 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
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 \
393 'git cat-file blob branch:newdir/interesting >actual &&
394 test_cmp expect actual'
396 echo "$file6_data" >expect
397 test_expect_success \
399 'git cat-file blob branch:newdir/exec.sh >actual &&
400 test_cmp expect actual'
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
414 from refs/heads/branch^0
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 \
425 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
428 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
429 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
433 test_expect_success \
435 'git cat-file commit branch | sed 1,2d >actual &&
436 test_cmp expect actual'
442 old_branch
=`git rev-parse --verify branch^0`
444 cat >input
<<INPUT_END
445 commit refs/heads/branch
446 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
448 losing things already?
451 from refs/heads/branch~1
453 reset refs/heads/other
454 from refs/heads/branch
457 test_expect_success \
458 'F: non-fast-forward update skips' \
459 'if git fast-import <input
461 echo BAD gfi did not fail
464 if test $old_branch = `git rev-parse --verify branch^0`
466 : branch unaffected and failure returned
469 echo BAD gfi changed branch $old_branch
474 test_expect_success \
476 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
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'
495 old_branch
=`git rev-parse --verify branch^0`
497 cat >input
<<INPUT_END
498 commit refs/heads/branch
499 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
501 losing things already?
504 from refs/heads/branch~1
507 test_expect_success \
508 'G: non-fast-forward update forced' \
509 'git fast-import --force <input'
510 test_expect_success \
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}`'
523 cat >input
<<INPUT_END
525 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
530 from refs/heads/branch^0
531 M 644 inline i-will-die
533 this file will never exist.
537 M 644 inline h/e/l/lo
543 test_expect_success \
544 'H: deletall, add 1' \
545 'git fast-import <input &&
547 test_expect_success \
549 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
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 \
566 'git cat-file blob H:h/e/l/lo >actual &&
567 test_cmp expect actual'
573 cat >input
<<INPUT_END
574 commit refs/heads/export-boundary
575 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
577 we have a border. its only 40 characters wide.
580 from refs/heads/branch
583 test_expect_success \
584 'I: export-pack-edges' \
585 'git fast-import --export-pack-edges=edges.list <input'
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'
599 cat >input
<<INPUT_END
601 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
606 from refs/heads/branch
611 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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`'
629 cat >input
<<INPUT_END
631 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
636 from refs/heads/branch
639 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
644 from refs/heads/branch^1
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`'
659 cat >input
<<INPUT_END
673 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
683 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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
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'
710 cat >input
<<INPUT_END
712 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
717 from refs/heads/branch^0
718 R file2/newf file2/n.e.w.f
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
733 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
738 from refs/heads/branch^0
739 R file2/newf i/am/new/to/you
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
754 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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'
778 cat >input
<<INPUT_END
780 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
785 from refs/heads/branch^0
786 C file2/newf file2/n.e.w.f
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
801 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
806 from refs/heads/branch^0
810 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
812 modify directory copy
815 M 644 inline file3/file5
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
835 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
840 from refs/heads/branch^0
841 M 644 inline file2/file5
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 &&
865 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
870 from refs/heads/branch^0
871 M 040000 $subdir file3
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 &&
886 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
888 copy root directory by tree hash
891 from refs/heads/branch^0
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 &&
908 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
913 from refs/heads/branch^0
914 M 040000 $subdir file3
917 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
919 modify directory copy
922 M 644 inline file3/file5
927 git fast-import <input &&
928 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
929 compare_diff_raw expect actual'
935 cat >input
<<INPUT_END
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.
945 # don't forget the import blank line!
947 # yes, we started from our usual base of 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
957 # don't forget to copy file2 to file3
960 # or to delete file5 from file2.
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
973 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
977 from refs/heads/branch^0
978 M 644 inline file2/file5
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' \
996 cat >input
<<INPUT_END
998 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1002 commit refs/heads/O3
1003 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1008 commit refs/heads/O3
1010 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1015 commit refs/heads/O3
1016 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1020 reset refs/tags/O3-2nd
1022 reset refs/tags/O3-3rd
1026 cat >expect
<<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
1046 commit refs/heads/O4
1047 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1051 progress Two commits down, 2 to go!
1052 commit refs/heads/O4
1053 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1057 progress Three commits down, 1 to go!
1058 commit refs/heads/O4
1059 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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
1081 reset refs/heads/sub
1082 commit refs/heads/sub
1084 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1097 commit refs/heads/subuse1
1099 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1102 from refs/heads/master
1103 M 100644 :3 .gitmodules
1112 commit refs/heads/sub
1114 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1120 commit refs/heads/subuse1
1122 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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 &&
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
1153 commit refs/heads/subuse2
1155 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1158 from refs/heads/master
1159 M 100644 :1 .gitmodules
1160 M 160000 $SUBPREV sub
1162 commit refs/heads/subuse2
1164 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1168 M 160000 $SUBLAST sub
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)'
1180 cat >input
<<INPUT_END
1181 commit refs/heads/subuse3
1183 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1188 from refs/heads/subuse2
1196 test_expect_success
'P: fail on inline gitlink' '
1197 test_must_fail git fast-import <input'
1200 cat >input
<<INPUT_END
1207 commit refs/heads/subuse3
1209 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1214 from refs/heads/subuse2
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"
1234 cat >input
<<INPUT_END
1241 commit refs/heads/notes-test
1243 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1254 commit refs/heads/notes-test
1256 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1263 commit refs/heads/notes-test
1265 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1292 commit refs/notes/foobar
1294 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1306 commit refs/notes/foobar
1308 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1318 commit refs/notes/foobar2
1320 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1330 commit refs/notes/foobar
1332 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1345 test_expect_success \
1347 'git fast-import <input &&
1348 git whatchanged notes-test'
1349 test_expect_success \
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
)
1358 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1359 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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'
1370 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1371 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1375 test_expect_success \
1376 'Q: verify second commit' \
1377 'git cat-file commit notes-test^ | sed 1d >actual &&
1378 test_cmp expect actual'
1382 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1383 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1387 test_expect_success \
1388 'Q: verify third commit' \
1389 'git cat-file commit notes-test | sed 1d >actual &&
1390 test_cmp expect actual'
1393 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1394 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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'
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
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'
1468 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1469 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
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'
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
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)
1523 feature no-such-feature-exists
1526 test_expect_success
'R: abort on unsupported feature' '
1527 test_must_fail git fast-import <input
1531 feature date-format=now
1534 test_expect_success
'R: supported feature is accepted' '
1535 git fast-import <input
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
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
1559 feature export-marks=git.marks
1567 test_expect_success \
1568 'R: export-marks feature results in a marks file being created' \
1569 'cat input | git fast-import &&
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'
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'
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'
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
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
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
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
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
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
1686 cat >>input
<<INPUT_END
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' \
1700 for p in R/.git/objects/pack/*.pack;
1702 git verify-pack -v $p >>verify || exit;
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) &&
1711 test_expect_success \
1712 'R: blob appears only once' \
1713 'n=$(grep $a verify | wc -l) &&