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`'
174 cat >input
<<INPUT_END
175 commit refs/heads/branch
177 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
182 from refs/heads/master
183 M 755 0000000000000000000000000000000000000001 zero1
186 test_expect_success
'B: fail on invalid blob sha1' '
187 test_must_fail git fast-import <input
189 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
191 cat >input
<<INPUT_END
192 commit .badbranchname
193 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
198 from refs/heads/master
201 test_expect_success
'B: fail on invalid branch name ".badbranchname"' '
202 test_must_fail git fast-import <input
204 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
206 cat >input
<<INPUT_END
207 commit bad[branch]name
208 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
213 from refs/heads/master
216 test_expect_success
'B: fail on invalid branch name "bad[branch]name"' '
217 test_must_fail git fast-import <input
219 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
221 cat >input
<<INPUT_END
223 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
228 from refs/heads/master
231 test_expect_success \
232 'B: accept branch name "TEMP_TAG"' \
233 'git fast-import <input &&
234 test -f .git/TEMP_TAG &&
235 test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
242 newf
=`echo hi newf | git hash-object -w --stdin`
243 oldf
=`git rev-parse --verify master:file2`
245 cat >input
<<INPUT_END
246 commit refs/heads/branch
247 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
252 from refs/heads/master
253 M 644 $oldf file2/oldf
254 M 755 $newf file2/newf
258 test_expect_success \
259 'C: incremental import create pack from stdin' \
260 'git fast-import <input &&
261 git whatchanged branch'
262 test_expect_success \
264 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
265 test_expect_success \
266 'C: validate reuse existing blob' \
267 'test $newf = `git rev-parse --verify branch:file2/newf`
268 test $oldf = `git rev-parse --verify branch:file2/oldf`'
271 parent `git rev-parse --verify master^0`
272 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
273 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
277 test_expect_success \
279 'git cat-file commit branch | sed 1d >actual &&
280 test_cmp expect actual'
283 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
284 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
285 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
287 git diff-tree
-M -r master branch
>actual
288 test_expect_success \
289 'C: validate rename result' \
290 'compare_diff_raw expect actual'
297 cat >input
<<INPUT_END
298 commit refs/heads/branch
299 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
304 from refs/heads/branch^0
305 M 644 inline newdir/interesting
310 M 755 inline newdir/exec.sh
316 test_expect_success \
317 'D: inline data in commit' \
318 'git fast-import <input &&
319 git whatchanged branch'
320 test_expect_success \
322 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
325 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
326 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
328 git diff-tree
-M -r branch^ branch
>actual
329 test_expect_success \
330 'D: validate new files added' \
331 'compare_diff_raw expect actual'
333 echo "$file5_data" >expect
334 test_expect_success \
336 'git cat-file blob branch:newdir/interesting >actual &&
337 test_cmp expect actual'
339 echo "$file6_data" >expect
340 test_expect_success \
342 'git cat-file blob branch:newdir/exec.sh >actual &&
343 test_cmp expect actual'
349 cat >input
<<INPUT_END
350 commit refs/heads/branch
351 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
352 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
357 from refs/heads/branch^0
360 test_expect_success
'E: rfc2822 date, --date-format=raw' '
361 test_must_fail git fast-import --date-format=raw <input
363 test_expect_success \
364 'E: rfc2822 date, --date-format=rfc2822' \
365 'git fast-import --date-format=rfc2822 <input'
366 test_expect_success \
368 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
371 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
372 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
376 test_expect_success \
378 'git cat-file commit branch | sed 1,2d >actual &&
379 test_cmp expect actual'
385 old_branch
=`git rev-parse --verify branch^0`
387 cat >input
<<INPUT_END
388 commit refs/heads/branch
389 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
391 losing things already?
394 from refs/heads/branch~1
396 reset refs/heads/other
397 from refs/heads/branch
400 test_expect_success \
401 'F: non-fast-forward update skips' \
402 'if git fast-import <input
404 echo BAD gfi did not fail
407 if test $old_branch = `git rev-parse --verify branch^0`
409 : branch unaffected and failure returned
412 echo BAD gfi changed branch $old_branch
417 test_expect_success \
419 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
422 tree `git rev-parse branch~1^{tree}`
423 parent `git rev-parse branch~1`
424 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
425 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
427 losing things already?
429 test_expect_success \
430 'F: verify other commit' \
431 'git cat-file commit other >actual &&
432 test_cmp expect actual'
438 old_branch
=`git rev-parse --verify branch^0`
440 cat >input
<<INPUT_END
441 commit refs/heads/branch
442 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
444 losing things already?
447 from refs/heads/branch~1
450 test_expect_success \
451 'G: non-fast-forward update forced' \
452 'git fast-import --force <input'
453 test_expect_success \
455 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
456 test_expect_success \
457 'G: branch changed, but logged' \
458 'test $old_branch != `git rev-parse --verify branch^0` &&
459 test $old_branch = `git rev-parse --verify branch@{1}`'
466 cat >input
<<INPUT_END
468 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
473 from refs/heads/branch^0
474 M 644 inline i-will-die
476 this file will never exist.
480 M 644 inline h/e/l/lo
486 test_expect_success \
487 'H: deletall, add 1' \
488 'git fast-import <input &&
490 test_expect_success \
492 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
495 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
496 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
497 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
498 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
499 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
501 git diff-tree
-M -r H^ H
>actual
502 test_expect_success \
503 'H: validate old files removed, new files added' \
504 'compare_diff_raw expect actual'
506 echo "$file5_data" >expect
507 test_expect_success \
509 'git cat-file blob H:h/e/l/lo >actual &&
510 test_cmp expect actual'
516 cat >input
<<INPUT_END
517 commit refs/heads/export-boundary
518 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
520 we have a border. its only 40 characters wide.
523 from refs/heads/branch
526 test_expect_success \
527 'I: export-pack-edges' \
528 'git fast-import --export-pack-edges=edges.list <input'
531 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
533 test_expect_success \
534 'I: verify edge list' \
535 'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
536 test_cmp expect actual'
542 cat >input
<<INPUT_END
544 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
549 from refs/heads/branch
554 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
560 test_expect_success \
561 'J: reset existing branch creates empty commit' \
562 'git fast-import <input'
563 test_expect_success \
564 'J: branch has 1 commit, empty tree' \
565 'test 1 = `git rev-list J | wc -l` &&
566 test 0 = `git ls-tree J | wc -l`'
572 cat >input
<<INPUT_END
574 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
579 from refs/heads/branch
582 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
587 from refs/heads/branch^1
590 test_expect_success \
591 'K: reinit branch with from' \
592 'git fast-import <input'
593 test_expect_success \
594 'K: verify K^1 = branch^1' \
595 'test `git rev-parse --verify branch^1` \
596 = `git rev-parse --verify K^1`'
602 cat >input
<<INPUT_END
616 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
626 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
636 cat >expect
<<EXPECT_END
637 :100644 100644 4268632... 55d3a52... M b.
638 :040000 040000 0ae5cac... 443c768... M b
639 :100644 100644 4268632... 55d3a52... M ba
642 test_expect_success \
643 'L: verify internal tree sorting' \
644 'git fast-import <input &&
645 git diff-tree --abbrev --raw L^ L >output &&
646 test_cmp expect output'
653 cat >input
<<INPUT_END
655 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
660 from refs/heads/branch^0
661 R file2/newf file2/n.e.w.f
666 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
668 test_expect_success \
669 'M: rename file in same subdirectory' \
670 'git fast-import <input &&
671 git diff-tree -M -r M1^ M1 >actual &&
672 compare_diff_raw expect actual'
674 cat >input
<<INPUT_END
676 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
681 from refs/heads/branch^0
682 R file2/newf i/am/new/to/you
687 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
689 test_expect_success \
690 'M: rename file to new subdirectory' \
691 'git fast-import <input &&
692 git diff-tree -M -r M2^ M2 >actual &&
693 compare_diff_raw expect actual'
695 cat >input
<<INPUT_END
697 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
708 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
710 test_expect_success \
711 'M: rename subdirectory to new subdirectory' \
712 'git fast-import <input &&
713 git diff-tree -M -r M3^ M3 >actual &&
714 compare_diff_raw expect actual'
721 cat >input
<<INPUT_END
723 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
728 from refs/heads/branch^0
729 C file2/newf file2/n.e.w.f
734 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
736 test_expect_success \
737 'N: copy file in same subdirectory' \
738 'git fast-import <input &&
739 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
740 compare_diff_raw expect actual'
742 cat >input
<<INPUT_END
744 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
749 from refs/heads/branch^0
753 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
755 modify directory copy
758 M 644 inline file3/file5
766 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
767 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
768 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
770 test_expect_success \
771 'N: copy then modify subdirectory' \
772 'git fast-import <input &&
773 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
774 compare_diff_raw expect actual'
776 cat >input
<<INPUT_END
778 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
783 from refs/heads/branch^0
784 M 644 inline file2/file5
794 test_expect_success \
795 'N: copy dirty subdirectory' \
796 'git fast-import <input &&
797 test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
799 test_expect_success \
800 'N: copy directory by id' \
801 'cat >expect <<-\EOF &&
802 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
803 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
805 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
806 cat >input <<-INPUT_END &&
808 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
813 from refs/heads/branch^0
814 M 040000 $subdir file3
816 git fast-import <input &&
817 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
818 compare_diff_raw expect actual'
820 test_expect_success \
821 'N: delete directory by copying' \
822 'cat >expect <<-\EOF &&
824 :100644 000000 OBJID OBJID D foo/bar/qux
826 :000000 100644 OBJID OBJID A foo/bar/baz
827 :000000 100644 OBJID OBJID A foo/bar/qux
829 empty_tree=$(git mktree </dev/null) &&
830 cat >input <<-INPUT_END &&
831 commit refs/heads/N-delete
832 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
834 collect data to be deleted
838 M 100644 inline foo/bar/baz
842 C "foo/bar/baz" "foo/bar/qux"
843 C "foo/bar/baz" "foo/bar/quux/1"
844 C "foo/bar/baz" "foo/bar/quuux"
845 M 040000 $empty_tree foo/bar/quux
846 M 040000 $empty_tree foo/bar/quuux
848 commit refs/heads/N-delete
849 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
854 M 040000 $empty_tree foo/bar/qux
856 git fast-import <input &&
857 git rev-list N-delete |
858 git diff-tree -r --stdin --root --always |
859 sed -e "s/$_x40/OBJID/g" >actual &&
860 test_cmp expect actual'
862 test_expect_success \
863 'N: modify copied tree' \
864 'cat >expect <<-\EOF &&
865 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
866 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
867 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
869 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
870 cat >input <<-INPUT_END &&
872 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
877 from refs/heads/branch^0
878 M 040000 $subdir file3
881 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
883 modify directory copy
886 M 644 inline file3/file5
891 git fast-import <input &&
892 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
893 compare_diff_raw expect actual'
899 cat >input
<<INPUT_END
902 # -- ignore all of this text
903 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
904 # $GIT_COMMITTER_NAME has inserted here for his benefit.
909 # don't forget the import blank line!
911 # yes, we started from our usual base of branch^0.
913 from refs/heads/branch^0
914 # and we need to reuse file2/file5 from N3 above.
915 M 644 inline file2/file5
916 # otherwise the tree will be different
921 # don't forget to copy file2 to file3
924 # or to delete file5 from file2.
930 test_expect_success \
931 'O: comments are all skipped' \
932 'git fast-import <input &&
933 test `git rev-parse N3` = `git rev-parse O1`'
935 cat >input
<<INPUT_END
937 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
941 from refs/heads/branch^0
942 M 644 inline file2/file5
951 test_expect_success \
952 'O: blank lines not necessary after data commands' \
953 'git fast-import <input &&
954 test `git rev-parse N3` = `git rev-parse O2`'
956 test_expect_success \
957 'O: repack before next test' \
960 cat >input
<<INPUT_END
962 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
967 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
974 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
980 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
984 reset refs/tags/O3-2nd
986 reset refs/tags/O3-3rd
990 cat >expect
<<INPUT_END
996 test_expect_success \
997 'O: blank lines not necessary after other commands' \
998 'git fast-import <input &&
999 test 8 = `find .git/objects/pack -type f | wc -l` &&
1000 test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1001 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1002 test_cmp expect actual'
1004 cat >input
<<INPUT_END
1005 commit refs/heads/O4
1006 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1010 commit refs/heads/O4
1011 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1015 progress Two commits down, 2 to go!
1016 commit refs/heads/O4
1017 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1021 progress Three commits down, 1 to go!
1022 commit refs/heads/O4
1023 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1029 test_expect_success \
1030 'O: progress outputs as requested by input' \
1031 'git fast-import <input >actual &&
1032 grep "progress " <input >expect &&
1033 test_cmp expect actual'
1036 ### series P (gitlinks)
1039 cat >input
<<INPUT_END
1045 reset refs/heads/sub
1046 commit refs/heads/sub
1048 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1061 commit refs/heads/subuse1
1063 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1066 from refs/heads/master
1067 M 100644 :3 .gitmodules
1076 commit refs/heads/sub
1078 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1084 commit refs/heads/subuse1
1086 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1094 test_expect_success \
1095 'P: supermodule & submodule mix' \
1096 'git fast-import <input &&
1097 git checkout subuse1 &&
1098 rm -rf sub && mkdir sub && cd sub &&
1100 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1101 git checkout master &&
1103 git submodule init &&
1104 git submodule update'
1106 SUBLAST
=$
(git rev-parse
--verify sub
)
1107 SUBPREV
=$
(git rev-parse
--verify sub^
)
1109 cat >input
<<INPUT_END
1118 commit refs/heads/subuse2
1120 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1123 from refs/heads/master
1124 M 100644 :1 .gitmodules
1125 M 160000 $SUBPREV sub
1127 commit refs/heads/subuse2
1129 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1133 M 160000 $SUBLAST sub
1137 test_expect_success \
1138 'P: verbatim SHA gitlinks' \
1139 'git branch -D sub &&
1140 git gc && git prune &&
1141 git fast-import <input &&
1142 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1145 cat >input
<<INPUT_END
1146 commit refs/heads/subuse3
1148 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1153 from refs/heads/subuse2
1161 test_expect_success
'P: fail on inline gitlink' '
1162 test_must_fail git fast-import <input'
1165 cat >input
<<INPUT_END
1172 commit refs/heads/subuse3
1174 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1179 from refs/heads/subuse2
1184 test_expect_success
'P: fail on blob mark in gitlink' '
1185 test_must_fail git fast-import <input'
1188 ### series Q (notes)
1191 note1_data
="The first note for the first commit"
1192 note2_data
="The first note for the second commit"
1193 note3_data
="The first note for the third commit"
1194 note1b_data
="The second note for the first commit"
1195 note1c_data
="The third note for the first commit"
1196 note2b_data
="The second note for the second commit"
1199 cat >input
<<INPUT_END
1206 commit refs/heads/notes-test
1208 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1219 commit refs/heads/notes-test
1221 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1228 commit refs/heads/notes-test
1230 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1257 commit refs/notes/foobar
1259 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1271 commit refs/notes/foobar
1273 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1283 commit refs/notes/foobar2
1285 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1295 commit refs/notes/foobar
1297 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1310 test_expect_success \
1312 'git fast-import <input &&
1313 git whatchanged notes-test'
1314 test_expect_success \
1316 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1318 commit1
=$
(git rev-parse notes-test~
2)
1319 commit2
=$
(git rev-parse notes-test^
)
1320 commit3
=$
(git rev-parse notes-test
)
1323 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1324 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1328 test_expect_success \
1329 'Q: verify first commit' \
1330 'git cat-file commit notes-test~2 | sed 1d >actual &&
1331 test_cmp expect actual'
1335 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1336 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1340 test_expect_success \
1341 'Q: verify second commit' \
1342 'git cat-file commit notes-test^ | sed 1d >actual &&
1343 test_cmp expect actual'
1347 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1348 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1352 test_expect_success \
1353 'Q: verify third commit' \
1354 'git cat-file commit notes-test | sed 1d >actual &&
1355 test_cmp expect actual'
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 notes commit' \
1365 'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1366 test_cmp expect actual'
1368 cat >expect.unsorted
<<EOF
1369 100644 blob $commit1
1370 100644 blob $commit2
1371 100644 blob $commit3
1373 cat expect.unsorted |
sort >expect
1374 test_expect_success \
1375 'Q: verify first notes tree' \
1376 'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1377 test_cmp expect actual'
1379 echo "$note1_data" >expect
1380 test_expect_success \
1381 'Q: verify first note for first commit' \
1382 'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1384 echo "$note2_data" >expect
1385 test_expect_success \
1386 'Q: verify first note for second commit' \
1387 'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1389 echo "$note3_data" >expect
1390 test_expect_success \
1391 'Q: verify first note for third commit' \
1392 'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1395 parent `git rev-parse --verify refs/notes/foobar~2`
1396 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1397 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1401 test_expect_success \
1402 'Q: verify second notes commit' \
1403 'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1404 test_cmp expect actual'
1406 cat >expect.unsorted
<<EOF
1407 100644 blob $commit1
1408 100644 blob $commit2
1409 100644 blob $commit3
1411 cat expect.unsorted |
sort >expect
1412 test_expect_success \
1413 'Q: verify second notes tree' \
1414 'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1415 test_cmp expect actual'
1417 echo "$note1b_data" >expect
1418 test_expect_success \
1419 'Q: verify second note for first commit' \
1420 'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1422 echo "$note2_data" >expect
1423 test_expect_success \
1424 'Q: verify first note for second commit' \
1425 'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1427 echo "$note3_data" >expect
1428 test_expect_success \
1429 'Q: verify first note for third commit' \
1430 'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1433 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1434 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1438 test_expect_success \
1439 'Q: verify third notes commit' \
1440 'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1441 test_cmp expect actual'
1443 cat >expect.unsorted
<<EOF
1444 100644 blob $commit1
1446 cat expect.unsorted |
sort >expect
1447 test_expect_success \
1448 'Q: verify third notes tree' \
1449 'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1450 test_cmp expect actual'
1452 echo "$note1c_data" >expect
1453 test_expect_success \
1454 'Q: verify third note for first commit' \
1455 'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1458 parent `git rev-parse --verify refs/notes/foobar^`
1459 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1460 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1464 test_expect_success \
1465 'Q: verify fourth notes commit' \
1466 'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1467 test_cmp expect actual'
1469 cat >expect.unsorted
<<EOF
1470 100644 blob $commit2
1472 cat expect.unsorted |
sort >expect
1473 test_expect_success \
1474 'Q: verify fourth notes tree' \
1475 'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1476 test_cmp expect actual'
1478 echo "$note2b_data" >expect
1479 test_expect_success \
1480 'Q: verify second note for second commit' \
1481 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1484 ### series R (feature and option)
1488 feature no-such-feature-exists
1491 test_expect_success
'R: abort on unsupported feature' '
1492 test_must_fail git fast-import <input
1496 feature date-format=now
1499 test_expect_success
'R: supported feature is accepted' '
1500 git fast-import <input
1507 feature date-format=now
1510 test_expect_success
'R: abort on receiving feature after data command' '
1511 test_must_fail git fast-import <input
1515 feature import-marks=git.marks
1516 feature import-marks=git2.marks
1519 test_expect_success
'R: only one import-marks feature allowed per stream' '
1520 test_must_fail git fast-import <input
1524 feature export-marks=git.marks
1532 test_expect_success \
1533 'R: export-marks feature results in a marks file being created' \
1534 'cat input | git fast-import &&
1537 test_expect_success \
1538 'R: export-marks options can be overriden by commandline options' \
1539 'cat input | git fast-import --export-marks=other.marks &&
1540 grep :1 other.marks'
1543 feature import-marks=marks.out
1544 feature export-marks=marks.new
1547 test_expect_success \
1548 'R: import to output marks works without any content' \
1549 'cat input | git fast-import &&
1550 test_cmp marks.out marks.new'
1553 feature import-marks=nonexistant.marks
1554 feature export-marks=marks.new
1557 test_expect_success \
1558 'R: import marks prefers commandline marks file over the stream' \
1559 'cat input | git fast-import --import-marks=marks.out &&
1560 test_cmp marks.out marks.new'
1564 feature import-marks=nonexistant.marks
1565 feature export-marks=combined.marks
1568 test_expect_success
'R: multiple --import-marks= should be honoured' '
1569 head -n2 marks.out > one.marks &&
1570 tail -n +3 marks.out > two.marks &&
1571 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1572 test_cmp marks.out combined.marks
1576 feature relative-marks
1577 feature import-marks=relative.in
1578 feature export-marks=relative.out
1581 test_expect_success
'R: feature relative-marks should be honoured' '
1582 mkdir -p .git/info/fast-import/ &&
1583 cp marks.new .git/info/fast-import/relative.in &&
1584 git fast-import <input &&
1585 test_cmp marks.new .git/info/fast-import/relative.out
1589 feature relative-marks
1590 feature import-marks=relative.in
1591 feature no-relative-marks
1592 feature export-marks=non-relative.out
1595 test_expect_success
'R: feature no-relative-marks should be honoured' '
1596 git fast-import <input &&
1597 test_cmp marks.new non-relative.out
1610 test_expect_success
'R: quiet option results in no stats being output' '
1611 cat input | git fast-import 2> output &&
1612 test_cmp empty output
1616 option git non-existing-option
1619 test_expect_success
'R: die on unknown option' '
1620 test_must_fail git fast-import <input
1623 test_expect_success
'R: unknown commandline options are rejected' '\
1624 test_must_fail git fast-import --non-existing-option < /dev/null
1628 option non-existing-vcs non-existing-option
1631 test_expect_success
'R: ignore non-git options' '
1632 git fast-import <input
1636 ## R: very large blobs
1638 blobsize
=$
((2*1024*1024 + 53))
1639 test-genrandom bar
$blobsize >expect
1640 cat >input
<<INPUT_END
1641 commit refs/heads/big-file
1642 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1651 cat >>input
<<INPUT_END
1658 test_expect_success \
1659 'R: blob bigger than threshold' \
1660 'test_create_repo R &&
1661 git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
1662 test_expect_success \
1663 'R: verify created pack' \
1665 for p in R/.git/objects/pack/*.pack;
1667 git verify-pack -v $p >>verify || exit;
1669 test_expect_success \
1670 'R: verify written objects' \
1671 'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
1672 test_cmp expect actual &&
1673 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
1674 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
1676 test_expect_success \
1677 'R: blob appears only once' \
1678 'n=$(grep $a verify | wc -l) &&