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
10 # Print $1 bytes from stdin to stdout.
12 # This could be written as "head -c $1", but IRIX "head" does not
13 # support the -c option.
19 my $nread = sysread(STDIN, $s, $len);
20 die "cannot read: $!" unless defined($nread);
37 file5_data='an inline file.
38 we should see it later.'
51 test_expect_success 'empty stream succeeds' '
52 git fast-import </dev/null
55 cat >input <<INPUT_END
72 commit refs/heads/master
74 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
86 An annotated tag without a tagger
91 'A: create pack from stdin' \
92 'git fast-import --export-marks=marks.out <input &&
93 git whatchanged master'
96 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
99 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
100 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
104 test_expect_success \
106 'git cat-file commit master | sed 1d >actual &&
107 test_cmp expect actual'
114 test_expect_success \
116 'git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
117 test_cmp expect actual'
119 echo "$file2_data" >expect
120 test_expect_success \
122 'git cat-file blob master:file2 >actual && test_cmp expect actual'
124 echo "$file3_data" >expect
125 test_expect_success \
127 'git cat-file blob master:file3 >actual && test_cmp expect actual'
129 printf "$file4_data" >expect
130 test_expect_success \
132 'git cat-file blob master:file4 >actual && test_cmp expect actual'
135 object $(git rev-parse refs/heads/master)
139 An annotated tag without a tagger
141 test_expect_success 'A: verify tag/series-A' '
142 git cat-file tag tags/series-A >actual &&
143 test_cmp expect actual
147 :2 `git rev-parse --verify master:file2`
148 :3 `git rev-parse --verify master:file3`
149 :4 `git rev-parse --verify master:file4`
150 :5 `git rev-parse --verify master^0`
152 test_expect_success \
153 'A: verify marks output' \
154 'test_cmp expect marks.out'
156 test_expect_success \
157 'A: verify marks import' \
159 --import-marks=marks.out \
160 --export-marks=marks.new \
162 test_cmp expect marks.new'
165 cat >input <<INPUT_END
166 commit refs/heads/verify--import-marks
167 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
173 M 755 :2 copy-of-file2
176 test_expect_success \
177 'A: verify marks import does not crash' \
178 'git fast-import --import-marks=marks.out <input &&
179 git whatchanged verify--import-marks'
180 test_expect_success \
182 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
184 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
186 git diff-tree -M -r master verify--import-marks >actual
187 test_expect_success \
189 'compare_diff_raw expect actual &&
190 test `git rev-parse --verify master:file2` \
191 = `git rev-parse --verify verify--import-marks:copy-of-file2`'
194 mt=$(git hash-object --stdin < /dev/null)
199 cat >input.commit <<EOF
200 commit refs/heads/verify--dump-marks
201 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
203 test the sparse array dumping routines with exponentially growing marks
211 while test "$i" -lt 27; do
212 cat >>input.blob <<EOF
223 echo "M 100644 :$l l$i" >>input.commit
224 echo "M 100644 :$m m$i" >>input.commit
225 echo "M 100644 :$n n$i" >>input.commit
227 echo ":$l $mt" >>marks.exp
228 echo ":$m $mt" >>marks.exp
229 echo ":$n $mt" >>marks.exp
231 printf "100644 blob $mt\tl$i\n" >>tree.exp
232 printf "100644 blob $mt\tm$i\n" >>tree.exp
233 printf "100644 blob $mt\tn$i\n" >>tree.exp
242 sort tree.exp > tree.exp_s
244 test_expect_success 'A: export marks with large values' '
245 cat input.blob input.commit | git fast-import --export-marks=marks.large &&
246 git ls-tree refs/heads/verify--dump-marks >tree.out &&
247 test_cmp tree.exp_s tree.out &&
248 test_cmp marks.exp marks.large'
255 cat >input <<INPUT_END
256 commit refs/heads/branch
258 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
263 from refs/heads/master
264 M 755 0000000000000000000000000000000000000001 zero1
267 test_expect_success 'B: fail on invalid blob sha1' '
268 test_must_fail git fast-import <input
270 rm -f .git/objects/pack_* .git/objects/index_*
272 cat >input <<INPUT_END
273 commit .badbranchname
274 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
279 from refs/heads/master
282 test_expect_success 'B: fail on invalid branch name ".badbranchname"' '
283 test_must_fail git fast-import <input
285 rm -f .git/objects/pack_* .git/objects/index_*
287 cat >input <<INPUT_END
288 commit bad[branch]name
289 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
294 from refs/heads/master
297 test_expect_success 'B: fail on invalid branch name "bad[branch]name"' '
298 test_must_fail git fast-import <input
300 rm -f .git/objects/pack_* .git/objects/index_*
302 cat >input <<INPUT_END
304 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
309 from refs/heads/master
312 test_expect_success \
313 'B: accept branch name "TEMP_TAG"' \
314 'git fast-import <input &&
315 test -f .git/TEMP_TAG &&
316 test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
323 newf=`echo hi newf | git hash-object -w --stdin`
324 oldf=`git rev-parse --verify master:file2`
326 cat >input <<INPUT_END
327 commit refs/heads/branch
328 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
333 from refs/heads/master
334 M 644 $oldf file2/oldf
335 M 755 $newf file2/newf
339 test_expect_success \
340 'C: incremental import create pack from stdin' \
341 'git fast-import <input &&
342 git whatchanged branch'
343 test_expect_success \
345 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
346 test_expect_success \
347 'C: validate reuse existing blob' \
348 'test $newf = `git rev-parse --verify branch:file2/newf` &&
349 test $oldf = `git rev-parse --verify branch:file2/oldf`'
352 parent `git rev-parse --verify master^0`
353 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
354 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
358 test_expect_success \
360 'git cat-file commit branch | sed 1d >actual &&
361 test_cmp expect actual'
364 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
365 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
366 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
368 git diff-tree -M -r master branch >actual
369 test_expect_success \
370 'C: validate rename result' \
371 'compare_diff_raw expect actual'
378 cat >input <<INPUT_END
379 commit refs/heads/branch
380 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
385 from refs/heads/branch^0
386 M 644 inline newdir/interesting
391 M 755 inline newdir/exec.sh
397 test_expect_success \
398 'D: inline data in commit' \
399 'git fast-import <input &&
400 git whatchanged branch'
401 test_expect_success \
403 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
406 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
407 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
409 git diff-tree -M -r branch^ branch >actual
410 test_expect_success \
411 'D: validate new files added' \
412 'compare_diff_raw expect actual'
414 echo "$file5_data" >expect
415 test_expect_success \
417 'git cat-file blob branch:newdir/interesting >actual &&
418 test_cmp expect actual'
420 echo "$file6_data" >expect
421 test_expect_success \
423 'git cat-file blob branch:newdir/exec.sh >actual &&
424 test_cmp expect actual'
430 cat >input <<INPUT_END
431 commit refs/heads/branch
432 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
433 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
438 from refs/heads/branch^0
441 test_expect_success 'E: rfc2822 date, --date-format=raw' '
442 test_must_fail git fast-import --date-format=raw <input
444 test_expect_success \
445 'E: rfc2822 date, --date-format=rfc2822' \
446 'git fast-import --date-format=rfc2822 <input'
447 test_expect_success \
449 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
452 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
453 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
457 test_expect_success \
459 'git cat-file commit branch | sed 1,2d >actual &&
460 test_cmp expect actual'
466 old_branch=`git rev-parse --verify branch^0`
468 cat >input <<INPUT_END
469 commit refs/heads/branch
470 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
472 losing things already?
475 from refs/heads/branch~1
477 reset refs/heads/other
478 from refs/heads/branch
481 test_expect_success \
482 'F: non-fast-forward update skips' \
483 'if git fast-import <input
485 echo BAD gfi did not fail
488 if test $old_branch = `git rev-parse --verify branch^0`
490 : branch unaffected and failure returned
493 echo BAD gfi changed branch $old_branch
498 test_expect_success \
500 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
503 tree `git rev-parse branch~1^{tree}`
504 parent `git rev-parse branch~1`
505 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
506 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
508 losing things already?
510 test_expect_success \
511 'F: verify other commit' \
512 'git cat-file commit other >actual &&
513 test_cmp expect actual'
519 old_branch=`git rev-parse --verify branch^0`
521 cat >input <<INPUT_END
522 commit refs/heads/branch
523 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
525 losing things already?
528 from refs/heads/branch~1
531 test_expect_success \
532 'G: non-fast-forward update forced' \
533 'git fast-import --force <input'
534 test_expect_success \
536 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
537 test_expect_success \
538 'G: branch changed, but logged' \
539 'test $old_branch != `git rev-parse --verify branch^0` &&
540 test $old_branch = `git rev-parse --verify branch@{1}`'
547 cat >input <<INPUT_END
549 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
554 from refs/heads/branch^0
555 M 644 inline i-will-die
557 this file will never exist.
561 M 644 inline h/e/l/lo
567 test_expect_success \
568 'H: deletall, add 1' \
569 'git fast-import <input &&
571 test_expect_success \
573 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
576 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
577 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
578 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
579 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
580 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
582 git diff-tree -M -r H^ H >actual
583 test_expect_success \
584 'H: validate old files removed, new files added' \
585 'compare_diff_raw expect actual'
587 echo "$file5_data" >expect
588 test_expect_success \
590 'git cat-file blob H:h/e/l/lo >actual &&
591 test_cmp expect actual'
597 cat >input <<INPUT_END
598 commit refs/heads/export-boundary
599 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
601 we have a border. its only 40 characters wide.
604 from refs/heads/branch
607 test_expect_success \
608 'I: export-pack-edges' \
609 'git fast-import --export-pack-edges=edges.list <input'
612 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
614 test_expect_success \
615 'I: verify edge list' \
616 'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
617 test_cmp expect actual'
623 cat >input <<INPUT_END
625 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
630 from refs/heads/branch
635 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
641 test_expect_success \
642 'J: reset existing branch creates empty commit' \
643 'git fast-import <input'
644 test_expect_success \
645 'J: branch has 1 commit, empty tree' \
646 'test 1 = `git rev-list J | wc -l` &&
647 test 0 = `git ls-tree J | wc -l`'
653 cat >input <<INPUT_END
655 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
660 from refs/heads/branch
663 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
668 from refs/heads/branch^1
671 test_expect_success \
672 'K: reinit branch with from' \
673 'git fast-import <input'
674 test_expect_success \
675 'K: verify K^1 = branch^1' \
676 'test `git rev-parse --verify branch^1` \
677 = `git rev-parse --verify K^1`'
683 cat >input <<INPUT_END
697 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
707 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
717 cat >expect <<EXPECT_END
718 :100644 100644 4268632... 55d3a52... M b.
719 :040000 040000 0ae5cac... 443c768... M b
720 :100644 100644 4268632... 55d3a52... M ba
723 test_expect_success \
724 'L: verify internal tree sorting' \
725 'git fast-import <input &&
726 git diff-tree --abbrev --raw L^ L >output &&
727 test_cmp expect output'
734 cat >input <<INPUT_END
736 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
741 from refs/heads/branch^0
742 R file2/newf file2/n.e.w.f
747 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
749 test_expect_success \
750 'M: rename file in same subdirectory' \
751 'git fast-import <input &&
752 git diff-tree -M -r M1^ M1 >actual &&
753 compare_diff_raw expect actual'
755 cat >input <<INPUT_END
757 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
762 from refs/heads/branch^0
763 R file2/newf i/am/new/to/you
768 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
770 test_expect_success \
771 'M: rename file to new subdirectory' \
772 'git fast-import <input &&
773 git diff-tree -M -r M2^ M2 >actual &&
774 compare_diff_raw expect actual'
776 cat >input <<INPUT_END
778 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
789 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
791 test_expect_success \
792 'M: rename subdirectory to new subdirectory' \
793 'git fast-import <input &&
794 git diff-tree -M -r M3^ M3 >actual &&
795 compare_diff_raw expect actual'
802 cat >input <<INPUT_END
804 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
809 from refs/heads/branch^0
810 C file2/newf file2/n.e.w.f
815 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
817 test_expect_success \
818 'N: copy file in same subdirectory' \
819 'git fast-import <input &&
820 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
821 compare_diff_raw expect actual'
823 cat >input <<INPUT_END
825 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
830 from refs/heads/branch^0
834 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
836 modify directory copy
839 M 644 inline file3/file5
847 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
848 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
849 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
851 test_expect_success \
852 'N: copy then modify subdirectory' \
853 'git fast-import <input &&
854 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
855 compare_diff_raw expect actual'
857 cat >input <<INPUT_END
859 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
864 from refs/heads/branch^0
865 M 644 inline file2/file5
875 test_expect_success \
876 'N: copy dirty subdirectory' \
877 'git fast-import <input &&
878 test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
880 test_expect_success \
881 'N: copy directory by id' \
882 'cat >expect <<-\EOF &&
883 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
884 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
886 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
887 cat >input <<-INPUT_END &&
889 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
894 from refs/heads/branch^0
895 M 040000 $subdir file3
897 git fast-import <input &&
898 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
899 compare_diff_raw expect actual'
901 test_expect_success \
902 'N: copy root directory by tree hash' \
903 'cat >expect <<-\EOF &&
904 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf
905 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf
907 root=$(git rev-parse refs/heads/branch^0^{tree}) &&
908 cat >input <<-INPUT_END &&
910 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
912 copy root directory by tree hash
915 from refs/heads/branch^0
918 git fast-import <input &&
919 git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
920 compare_diff_raw expect actual'
922 test_expect_success \
923 'N: delete directory by copying' \
924 'cat >expect <<-\EOF &&
926 :100644 000000 OBJID OBJID D foo/bar/qux
928 :000000 100644 OBJID OBJID A foo/bar/baz
929 :000000 100644 OBJID OBJID A foo/bar/qux
931 empty_tree=$(git mktree </dev/null) &&
932 cat >input <<-INPUT_END &&
933 commit refs/heads/N-delete
934 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
936 collect data to be deleted
940 M 100644 inline foo/bar/baz
944 C "foo/bar/baz" "foo/bar/qux"
945 C "foo/bar/baz" "foo/bar/quux/1"
946 C "foo/bar/baz" "foo/bar/quuux"
947 M 040000 $empty_tree foo/bar/quux
948 M 040000 $empty_tree foo/bar/quuux
950 commit refs/heads/N-delete
951 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
956 M 040000 $empty_tree foo/bar/qux
958 git fast-import <input &&
959 git rev-list N-delete |
960 git diff-tree -r --stdin --root --always |
961 sed -e "s/$_x40/OBJID/g" >actual &&
962 test_cmp expect actual'
964 test_expect_success \
965 'N: modify copied tree' \
966 'cat >expect <<-\EOF &&
967 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
968 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
969 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
971 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
972 cat >input <<-INPUT_END &&
974 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
979 from refs/heads/branch^0
980 M 040000 $subdir file3
983 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
985 modify directory copy
988 M 644 inline file3/file5
993 git fast-import <input &&
994 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
995 compare_diff_raw expect actual'
997 test_expect_success \
998 'N: reject foo/ syntax' \
999 'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1000 test_must_fail git fast-import <<-INPUT_END
1001 commit refs/heads/N5B
1002 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1004 copy with invalid syntax
1007 from refs/heads/branch^0
1008 M 040000 $subdir file3/
1011 test_expect_success \
1012 'N: copy to root by id and modify' \
1013 'echo "hello, world" >expect.foo &&
1014 echo hello >expect.bar &&
1015 git fast-import <<-SETUP_END &&
1016 commit refs/heads/N7
1017 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1023 M 644 inline foo/bar
1029 tree=$(git rev-parse --verify N7:) &&
1030 git fast-import <<-INPUT_END &&
1031 commit refs/heads/N8
1032 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1034 copy to root by id and modify
1038 M 644 inline foo/foo
1043 git show N8:foo/foo >actual.foo &&
1044 git show N8:foo/bar >actual.bar &&
1045 test_cmp expect.foo actual.foo &&
1046 test_cmp expect.bar actual.bar'
1048 test_expect_success \
1049 'N: extract subtree' \
1050 'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1051 cat >input <<-INPUT_END &&
1052 commit refs/heads/N9
1053 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1055 extract subtree branch:newdir
1061 git fast-import <input &&
1062 git diff --exit-code branch:newdir N9'
1064 test_expect_success \
1065 'N: modify subtree, extract it, and modify again' \
1066 'echo hello >expect.baz &&
1067 echo hello, world >expect.qux &&
1068 git fast-import <<-SETUP_END &&
1069 commit refs/heads/N10
1070 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1076 M 644 inline foo/bar/baz
1082 tree=$(git rev-parse --verify N10:) &&
1083 git fast-import <<-INPUT_END &&
1084 commit refs/heads/N11
1085 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1087 copy to root by id and modify
1091 M 100644 inline foo/bar/qux
1096 C "bar/qux" "bar/quux"
1098 git show N11:bar/baz >actual.baz &&
1099 git show N11:bar/qux >actual.qux &&
1100 git show N11:bar/quux >actual.quux &&
1101 test_cmp expect.baz actual.baz &&
1102 test_cmp expect.qux actual.qux &&
1103 test_cmp expect.qux actual.quux'
1109 cat >input <<INPUT_END
1111 commit refs/heads/O1
1112 # -- ignore all of this text
1113 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1114 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1116 dirty directory copy
1119 # don't forget the import blank line!
1121 # yes, we started from our usual base of branch^0.
1123 from refs/heads/branch^0
1124 # and we need to reuse file2/file5 from N3 above.
1125 M 644 inline file2/file5
1126 # otherwise the tree will be different
1131 # don't forget to copy file2 to file3
1134 # or to delete file5 from file2.
1140 test_expect_success \
1141 'O: comments are all skipped' \
1142 'git fast-import <input &&
1143 test `git rev-parse N3` = `git rev-parse O1`'
1145 cat >input <<INPUT_END
1146 commit refs/heads/O2
1147 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1149 dirty directory copy
1151 from refs/heads/branch^0
1152 M 644 inline file2/file5
1161 test_expect_success \
1162 'O: blank lines not necessary after data commands' \
1163 'git fast-import <input &&
1164 test `git rev-parse N3` = `git rev-parse O2`'
1166 test_expect_success \
1167 'O: repack before next test' \
1170 cat >input <<INPUT_END
1171 commit refs/heads/O3
1172 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1176 commit refs/heads/O3
1177 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1182 commit refs/heads/O3
1184 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1189 commit refs/heads/O3
1190 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1194 reset refs/tags/O3-2nd
1196 reset refs/tags/O3-3rd
1200 cat >expect <<INPUT_END
1206 test_expect_success \
1207 'O: blank lines not necessary after other commands' \
1208 'git fast-import <input &&
1209 test 8 = `find .git/objects/pack -type f | wc -l` &&
1210 test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1211 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1212 test_cmp expect actual'
1214 cat >input <<INPUT_END
1215 commit refs/heads/O4
1216 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1220 commit refs/heads/O4
1221 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1225 progress Two commits down, 2 to go!
1226 commit refs/heads/O4
1227 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1231 progress Three commits down, 1 to go!
1232 commit refs/heads/O4
1233 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1239 test_expect_success \
1240 'O: progress outputs as requested by input' \
1241 'git fast-import <input >actual &&
1242 grep "progress " <input >expect &&
1243 test_cmp expect actual'
1246 ### series P (gitlinks)
1249 cat >input <<INPUT_END
1255 reset refs/heads/sub
1256 commit refs/heads/sub
1258 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1271 commit refs/heads/subuse1
1273 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1276 from refs/heads/master
1277 M 100644 :3 .gitmodules
1286 commit refs/heads/sub
1288 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1294 commit refs/heads/subuse1
1296 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1304 test_expect_success \
1305 'P: supermodule & submodule mix' \
1306 'git fast-import <input &&
1307 git checkout subuse1 &&
1308 rm -rf sub && mkdir sub && (cd sub &&
1310 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1311 git checkout master) &&
1312 git submodule init &&
1313 git submodule update'
1315 SUBLAST=$(git rev-parse --verify sub)
1316 SUBPREV=$(git rev-parse --verify sub^)
1318 cat >input <<INPUT_END
1327 commit refs/heads/subuse2
1329 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1332 from refs/heads/master
1333 M 100644 :1 .gitmodules
1334 M 160000 $SUBPREV sub
1336 commit refs/heads/subuse2
1338 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1342 M 160000 $SUBLAST sub
1346 test_expect_success \
1347 'P: verbatim SHA gitlinks' \
1348 'git branch -D sub &&
1349 git gc && git prune &&
1350 git fast-import <input &&
1351 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1354 cat >input <<INPUT_END
1355 commit refs/heads/subuse3
1357 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1362 from refs/heads/subuse2
1370 test_expect_success 'P: fail on inline gitlink' '
1371 test_must_fail git fast-import <input'
1374 cat >input <<INPUT_END
1381 commit refs/heads/subuse3
1383 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1388 from refs/heads/subuse2
1393 test_expect_success 'P: fail on blob mark in gitlink' '
1394 test_must_fail git fast-import <input'
1397 ### series Q (notes)
1400 note1_data="The first note for the first commit"
1401 note2_data="The first note for the second commit"
1402 note3_data="The first note for the third commit"
1403 note1b_data="The second note for the first commit"
1404 note1c_data="The third note for the first commit"
1405 note2b_data="The second note for the second commit"
1408 cat >input <<INPUT_END
1415 commit refs/heads/notes-test
1417 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1428 commit refs/heads/notes-test
1430 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1437 commit refs/heads/notes-test
1439 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1466 commit refs/notes/foobar
1468 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1480 commit refs/notes/foobar
1482 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1492 commit refs/notes/foobar2
1494 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1504 commit refs/notes/foobar
1506 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1519 test_expect_success \
1521 'git fast-import <input &&
1522 git whatchanged notes-test'
1523 test_expect_success \
1525 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1527 commit1=$(git rev-parse notes-test~2)
1528 commit2=$(git rev-parse notes-test^)
1529 commit3=$(git rev-parse notes-test)
1532 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1533 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1537 test_expect_success \
1538 'Q: verify first commit' \
1539 'git cat-file commit notes-test~2 | sed 1d >actual &&
1540 test_cmp expect actual'
1544 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1545 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1549 test_expect_success \
1550 'Q: verify second commit' \
1551 'git cat-file commit notes-test^ | sed 1d >actual &&
1552 test_cmp expect actual'
1556 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1557 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1561 test_expect_success \
1562 'Q: verify third commit' \
1563 'git cat-file commit notes-test | sed 1d >actual &&
1564 test_cmp expect actual'
1567 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1568 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1572 test_expect_success \
1573 'Q: verify first notes commit' \
1574 'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1575 test_cmp expect actual'
1577 cat >expect.unsorted <<EOF
1578 100644 blob $commit1
1579 100644 blob $commit2
1580 100644 blob $commit3
1582 cat expect.unsorted | sort >expect
1583 test_expect_success \
1584 'Q: verify first notes tree' \
1585 'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1586 test_cmp expect actual'
1588 echo "$note1_data" >expect
1589 test_expect_success \
1590 'Q: verify first note for first commit' \
1591 'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1593 echo "$note2_data" >expect
1594 test_expect_success \
1595 'Q: verify first note for second commit' \
1596 'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1598 echo "$note3_data" >expect
1599 test_expect_success \
1600 'Q: verify first note for third commit' \
1601 'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1604 parent `git rev-parse --verify refs/notes/foobar~2`
1605 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1606 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1610 test_expect_success \
1611 'Q: verify second notes commit' \
1612 'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1613 test_cmp expect actual'
1615 cat >expect.unsorted <<EOF
1616 100644 blob $commit1
1617 100644 blob $commit2
1618 100644 blob $commit3
1620 cat expect.unsorted | sort >expect
1621 test_expect_success \
1622 'Q: verify second notes tree' \
1623 'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1624 test_cmp expect actual'
1626 echo "$note1b_data" >expect
1627 test_expect_success \
1628 'Q: verify second note for first commit' \
1629 'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1631 echo "$note2_data" >expect
1632 test_expect_success \
1633 'Q: verify first note for second commit' \
1634 'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1636 echo "$note3_data" >expect
1637 test_expect_success \
1638 'Q: verify first note for third commit' \
1639 'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1642 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1643 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1647 test_expect_success \
1648 'Q: verify third notes commit' \
1649 'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1650 test_cmp expect actual'
1652 cat >expect.unsorted <<EOF
1653 100644 blob $commit1
1655 cat expect.unsorted | sort >expect
1656 test_expect_success \
1657 'Q: verify third notes tree' \
1658 'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1659 test_cmp expect actual'
1661 echo "$note1c_data" >expect
1662 test_expect_success \
1663 'Q: verify third note for first commit' \
1664 'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1667 parent `git rev-parse --verify refs/notes/foobar^`
1668 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1669 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1673 test_expect_success \
1674 'Q: verify fourth notes commit' \
1675 'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1676 test_cmp expect actual'
1678 cat >expect.unsorted <<EOF
1679 100644 blob $commit2
1681 cat expect.unsorted | sort >expect
1682 test_expect_success \
1683 'Q: verify fourth notes tree' \
1684 'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1685 test_cmp expect actual'
1687 echo "$note2b_data" >expect
1688 test_expect_success \
1689 'Q: verify second note for second commit' \
1690 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1693 ### series R (feature and option)
1697 feature no-such-feature-exists
1700 test_expect_success 'R: abort on unsupported feature' '
1701 test_must_fail git fast-import <input
1705 feature date-format=now
1708 test_expect_success 'R: supported feature is accepted' '
1709 git fast-import <input
1716 feature date-format=now
1719 test_expect_success 'R: abort on receiving feature after data command' '
1720 test_must_fail git fast-import <input
1724 feature import-marks=git.marks
1725 feature import-marks=git2.marks
1728 test_expect_success 'R: only one import-marks feature allowed per stream' '
1729 test_must_fail git fast-import <input
1733 feature export-marks=git.marks
1741 test_expect_success \
1742 'R: export-marks feature results in a marks file being created' \
1743 'cat input | git fast-import &&
1746 test_expect_success \
1747 'R: export-marks options can be overriden by commandline options' \
1748 'cat input | git fast-import --export-marks=other.marks &&
1749 grep :1 other.marks'
1752 feature import-marks=marks.out
1753 feature export-marks=marks.new
1756 test_expect_success \
1757 'R: import to output marks works without any content' \
1758 'cat input | git fast-import &&
1759 test_cmp marks.out marks.new'
1762 feature import-marks=nonexistant.marks
1763 feature export-marks=marks.new
1766 test_expect_success \
1767 'R: import marks prefers commandline marks file over the stream' \
1768 'cat input | git fast-import --import-marks=marks.out &&
1769 test_cmp marks.out marks.new'
1773 feature import-marks=nonexistant.marks
1774 feature export-marks=combined.marks
1777 test_expect_success 'R: multiple --import-marks= should be honoured' '
1778 head -n2 marks.out > one.marks &&
1779 tail -n +3 marks.out > two.marks &&
1780 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1781 test_cmp marks.out combined.marks
1785 feature relative-marks
1786 feature import-marks=relative.in
1787 feature export-marks=relative.out
1790 test_expect_success 'R: feature relative-marks should be honoured' '
1791 mkdir -p .git/info/fast-import/ &&
1792 cp marks.new .git/info/fast-import/relative.in &&
1793 git fast-import <input &&
1794 test_cmp marks.new .git/info/fast-import/relative.out
1798 feature relative-marks
1799 feature import-marks=relative.in
1800 feature no-relative-marks
1801 feature export-marks=non-relative.out
1804 test_expect_success 'R: feature no-relative-marks should be honoured' '
1805 git fast-import <input &&
1806 test_cmp marks.new non-relative.out
1809 test_expect_success 'R: feature cat-blob supported' '
1810 echo "feature cat-blob" |
1814 test_expect_success 'R: cat-blob-fd must be a nonnegative integer' '
1815 test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
1818 test_expect_success 'R: print old blob' '
1819 blob=$(echo "yes it can" | git hash-object -w --stdin) &&
1820 cat >expect <<-EOF &&
1825 echo "cat-blob $blob" |
1826 git fast-import --cat-blob-fd=6 6>actual &&
1827 test_cmp expect actual
1830 test_expect_success 'R: in-stream cat-blob-fd not respected' '
1831 echo hello >greeting &&
1832 blob=$(git hash-object -w greeting) &&
1833 cat >expect <<-EOF &&
1838 git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
1841 test_cmp expect actual.3 &&
1842 test_cmp empty actual.1 &&
1843 git fast-import 3>actual.3 >actual.1 <<-EOF &&
1844 option cat-blob-fd=3
1847 test_cmp empty actual.3 &&
1848 test_cmp expect actual.1
1851 test_expect_success 'R: print new blob' '
1852 blob=$(echo "yep yep yep" | git hash-object --stdin) &&
1853 cat >expect <<-EOF &&
1858 git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
1866 test_cmp expect actual
1869 test_expect_success 'R: print new blob by sha1' '
1870 blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
1871 cat >expect <<-EOF &&
1873 a new blob named by sha1
1876 git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
1879 a new blob named by sha1
1883 test_cmp expect actual
1886 test_expect_success 'setup: big file' '
1888 echo "the quick brown fox jumps over the lazy dog" >big &&
1891 cat big big big big >bigger &&
1892 cat bigger bigger bigger bigger >big ||
1898 test_expect_success 'R: print two blobs to stdout' '
1899 blob1=$(git hash-object big) &&
1900 blob1_len=$(wc -c <big) &&
1901 blob2=$(echo hello | git hash-object --stdin) &&
1903 echo ${blob1} blob $blob1_len &&
1913 cat <<-\END_PART1 &&
1930 git fast-import >actual &&
1931 test_cmp expect actual
1934 test_expect_success 'setup: have pipes?' '
1938 test_set_prereq PIPE
1942 test_expect_success PIPE 'R: copy using cat-file' '
1943 expect_id=$(git hash-object big) &&
1944 expect_len=$(wc -c <big) &&
1945 echo $expect_id blob $expect_len >expect.response &&
1948 cat >frontend <<-\FRONTEND_END &&
1954 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
1967 read blob_id type size <&3 &&
1968 echo "$blob_id $type $size" >response &&
1969 head_c $size >blob <&3 &&
1973 commit refs/heads/copied
1974 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1976 copy big file as file3
1984 git fast-import --cat-blob-fd=3 3>blobs &&
1985 git show copied:file3 >actual &&
1986 test_cmp expect.response response &&
1990 test_expect_success PIPE 'R: print blob mid-commit' '
1992 echo "A blob from _before_ the commit." >expect &&
2001 A blob from _before_ the commit.
2003 commit refs/heads/temporary
2004 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2011 read blob_id type size <&3 &&
2012 head_c $size >actual <&3 &&
2017 git fast-import --cat-blob-fd=3 3>blobs &&
2018 test_cmp expect actual
2021 test_expect_success PIPE 'R: print staged blob within commit' '
2023 echo "A blob from _within_ the commit." >expect &&
2029 commit refs/heads/within
2030 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2036 A blob from _within_ the commit.
2041 echo "A blob from _within_ the commit." |
2042 git hash-object --stdin
2044 echo "cat-blob $to_get" &&
2046 read blob_id type size <&3 &&
2047 head_c $size >actual <&3 &&
2052 git fast-import --cat-blob-fd=3 3>blobs &&
2053 test_cmp expect actual
2064 test_expect_success 'R: quiet option results in no stats being output' '
2065 cat input | git fast-import 2> output &&
2066 test_cmp empty output
2070 option git non-existing-option
2073 test_expect_success 'R: die on unknown option' '
2074 test_must_fail git fast-import <input
2077 test_expect_success 'R: unknown commandline options are rejected' '\
2078 test_must_fail git fast-import --non-existing-option < /dev/null
2081 test_expect_success 'R: die on invalid option argument' '
2082 echo "option git active-branches=-5" |
2083 test_must_fail git fast-import &&
2084 echo "option git depth=" |
2085 test_must_fail git fast-import &&
2086 test_must_fail git fast-import --depth="5 elephants" </dev/null
2090 option non-existing-vcs non-existing-option
2093 test_expect_success 'R: ignore non-git options' '
2094 git fast-import <input
2098 ## R: very large blobs
2100 blobsize=$((2*1024*1024 + 53))
2101 test-genrandom bar $blobsize >expect
2102 cat >input <<INPUT_END
2103 commit refs/heads/big-file
2104 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2113 cat >>input <<INPUT_END
2120 test_expect_success \
2121 'R: blob bigger than threshold' \
2122 'test_create_repo R &&
2123 git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
2124 test_expect_success \
2125 'R: verify created pack' \
2127 for p in R/.git/objects/pack/*.pack;
2129 git verify-pack -v $p >>verify || exit;
2131 test_expect_success \
2132 'R: verify written objects' \
2133 'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2134 test_cmp expect actual &&
2135 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2136 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2138 test_expect_success \
2139 'R: blob appears only once' \
2140 'n=$(grep $a verify | wc -l) &&