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.'
45 test_expect_success
'setup: have pipes?' '
59 test_expect_success
'empty stream succeeds' '
60 git fast-import </dev/null
63 cat >input
<<INPUT_END
80 commit refs/heads/master
82 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
94 An annotated tag without a tagger
99 'A: create pack from stdin' \
100 'git fast-import --export-marks=marks.out <input &&
101 git whatchanged master'
102 test_expect_success \
104 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
107 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
108 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
112 test_expect_success \
114 'git cat-file commit master | sed 1d >actual &&
115 test_cmp expect actual'
122 test_expect_success \
124 'git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
125 test_cmp expect actual'
127 echo "$file2_data" >expect
128 test_expect_success \
130 'git cat-file blob master:file2 >actual && test_cmp expect actual'
132 echo "$file3_data" >expect
133 test_expect_success \
135 'git cat-file blob master:file3 >actual && test_cmp expect actual'
137 printf "$file4_data" >expect
138 test_expect_success \
140 'git cat-file blob master:file4 >actual && test_cmp expect actual'
143 object $(git rev-parse refs/heads/master)
147 An annotated tag without a tagger
149 test_expect_success
'A: verify tag/series-A' '
150 git cat-file tag tags/series-A >actual &&
151 test_cmp expect actual
155 :2 `git rev-parse --verify master:file2`
156 :3 `git rev-parse --verify master:file3`
157 :4 `git rev-parse --verify master:file4`
158 :5 `git rev-parse --verify master^0`
160 test_expect_success \
161 'A: verify marks output' \
162 'test_cmp expect marks.out'
164 test_expect_success \
165 'A: verify marks import' \
167 --import-marks=marks.out \
168 --export-marks=marks.new \
170 test_cmp expect marks.new'
173 cat >input
<<INPUT_END
174 commit refs/heads/verify--import-marks
175 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
181 M 755 :2 copy-of-file2
184 test_expect_success \
185 'A: verify marks import does not crash' \
186 'git fast-import --import-marks=marks.out <input &&
187 git whatchanged verify--import-marks'
188 test_expect_success \
190 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
192 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
194 git diff-tree
-M -r master verify--import-marks
>actual
195 test_expect_success \
197 'compare_diff_raw expect actual &&
198 test `git rev-parse --verify master:file2` \
199 = `git rev-parse --verify verify--import-marks:copy-of-file2`'
202 mt
=$
(git hash-object
--stdin < /dev
/null
)
207 cat >input.commit
<<EOF
208 commit refs/heads/verify--dump-marks
209 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
211 test the sparse array dumping routines with exponentially growing marks
219 while test "$i" -lt 27; do
220 cat >>input.blob
<<EOF
231 echo "M 100644 :$l l$i" >>input.commit
232 echo "M 100644 :$m m$i" >>input.commit
233 echo "M 100644 :$n n$i" >>input.commit
235 echo ":$l $mt" >>marks.exp
236 echo ":$m $mt" >>marks.exp
237 echo ":$n $mt" >>marks.exp
239 printf "100644 blob $mt\tl$i\n" >>tree.exp
240 printf "100644 blob $mt\tm$i\n" >>tree.exp
241 printf "100644 blob $mt\tn$i\n" >>tree.exp
250 sort tree.exp
> tree.exp_s
252 test_expect_success
'A: export marks with large values' '
253 cat input.blob input.commit | git fast-import --export-marks=marks.large &&
254 git ls-tree refs/heads/verify--dump-marks >tree.out &&
255 test_cmp tree.exp_s tree.out &&
256 test_cmp marks.exp marks.large'
263 cat >input
<<INPUT_END
264 commit refs/heads/branch
266 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
271 from refs/heads/master
272 M 755 0000000000000000000000000000000000000001 zero1
275 test_expect_success
'B: fail on invalid blob sha1' '
276 test_must_fail git fast-import <input
278 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
280 cat >input
<<INPUT_END
281 commit .badbranchname
282 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
287 from refs/heads/master
290 test_expect_success
'B: fail on invalid branch name ".badbranchname"' '
291 test_must_fail git fast-import <input
293 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
295 cat >input
<<INPUT_END
296 commit bad[branch]name
297 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
302 from refs/heads/master
305 test_expect_success
'B: fail on invalid branch name "bad[branch]name"' '
306 test_must_fail git fast-import <input
308 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
310 cat >input
<<INPUT_END
312 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
317 from refs/heads/master
320 test_expect_success \
321 'B: accept branch name "TEMP_TAG"' \
322 'git fast-import <input &&
323 test -f .git/TEMP_TAG &&
324 test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
331 newf
=`echo hi newf | git hash-object -w --stdin`
332 oldf
=`git rev-parse --verify master:file2`
334 cat >input
<<INPUT_END
335 commit refs/heads/branch
336 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
341 from refs/heads/master
342 M 644 $oldf file2/oldf
343 M 755 $newf file2/newf
347 test_expect_success \
348 'C: incremental import create pack from stdin' \
349 'git fast-import <input &&
350 git whatchanged branch'
351 test_expect_success \
353 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
354 test_expect_success \
355 'C: validate reuse existing blob' \
356 'test $newf = `git rev-parse --verify branch:file2/newf` &&
357 test $oldf = `git rev-parse --verify branch:file2/oldf`'
360 parent `git rev-parse --verify master^0`
361 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
362 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
366 test_expect_success \
368 'git cat-file commit branch | sed 1d >actual &&
369 test_cmp expect actual'
372 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
373 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
374 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
376 git diff-tree
-M -r master branch
>actual
377 test_expect_success \
378 'C: validate rename result' \
379 'compare_diff_raw expect actual'
386 cat >input
<<INPUT_END
387 commit refs/heads/branch
388 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
393 from refs/heads/branch^0
394 M 644 inline newdir/interesting
399 M 755 inline newdir/exec.sh
405 test_expect_success \
406 'D: inline data in commit' \
407 'git fast-import <input &&
408 git whatchanged branch'
409 test_expect_success \
411 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
414 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
415 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
417 git diff-tree
-M -r branch^ branch
>actual
418 test_expect_success \
419 'D: validate new files added' \
420 'compare_diff_raw expect actual'
422 echo "$file5_data" >expect
423 test_expect_success \
425 'git cat-file blob branch:newdir/interesting >actual &&
426 test_cmp expect actual'
428 echo "$file6_data" >expect
429 test_expect_success \
431 'git cat-file blob branch:newdir/exec.sh >actual &&
432 test_cmp expect actual'
438 cat >input
<<INPUT_END
439 commit refs/heads/branch
440 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
441 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
446 from refs/heads/branch^0
449 test_expect_success
'E: rfc2822 date, --date-format=raw' '
450 test_must_fail git fast-import --date-format=raw <input
452 test_expect_success \
453 'E: rfc2822 date, --date-format=rfc2822' \
454 'git fast-import --date-format=rfc2822 <input'
455 test_expect_success \
457 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
460 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
461 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
465 test_expect_success \
467 'git cat-file commit branch | sed 1,2d >actual &&
468 test_cmp expect actual'
474 old_branch
=`git rev-parse --verify branch^0`
476 cat >input
<<INPUT_END
477 commit refs/heads/branch
478 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
480 losing things already?
483 from refs/heads/branch~1
485 reset refs/heads/other
486 from refs/heads/branch
489 test_expect_success \
490 'F: non-fast-forward update skips' \
491 'if git fast-import <input
493 echo BAD gfi did not fail
496 if test $old_branch = `git rev-parse --verify branch^0`
498 : branch unaffected and failure returned
501 echo BAD gfi changed branch $old_branch
506 test_expect_success \
508 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
511 tree `git rev-parse branch~1^{tree}`
512 parent `git rev-parse branch~1`
513 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
514 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
516 losing things already?
518 test_expect_success \
519 'F: verify other commit' \
520 'git cat-file commit other >actual &&
521 test_cmp expect actual'
527 old_branch
=`git rev-parse --verify branch^0`
529 cat >input
<<INPUT_END
530 commit refs/heads/branch
531 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
533 losing things already?
536 from refs/heads/branch~1
539 test_expect_success \
540 'G: non-fast-forward update forced' \
541 'git fast-import --force <input'
542 test_expect_success \
544 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
545 test_expect_success \
546 'G: branch changed, but logged' \
547 'test $old_branch != `git rev-parse --verify branch^0` &&
548 test $old_branch = `git rev-parse --verify branch@{1}`'
555 cat >input
<<INPUT_END
557 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
562 from refs/heads/branch^0
563 M 644 inline i-will-die
565 this file will never exist.
569 M 644 inline h/e/l/lo
575 test_expect_success \
576 'H: deletall, add 1' \
577 'git fast-import <input &&
579 test_expect_success \
581 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
584 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
585 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
586 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
587 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
588 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
590 git diff-tree
-M -r H^ H
>actual
591 test_expect_success \
592 'H: validate old files removed, new files added' \
593 'compare_diff_raw expect actual'
595 echo "$file5_data" >expect
596 test_expect_success \
598 'git cat-file blob H:h/e/l/lo >actual &&
599 test_cmp expect actual'
605 cat >input
<<INPUT_END
606 commit refs/heads/export-boundary
607 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
609 we have a border. its only 40 characters wide.
612 from refs/heads/branch
615 test_expect_success \
616 'I: export-pack-edges' \
617 'git fast-import --export-pack-edges=edges.list <input'
620 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
622 test_expect_success \
623 'I: verify edge list' \
624 'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
625 test_cmp expect actual'
631 cat >input
<<INPUT_END
633 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
638 from refs/heads/branch
643 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
649 test_expect_success \
650 'J: reset existing branch creates empty commit' \
651 'git fast-import <input'
652 test_expect_success \
653 'J: branch has 1 commit, empty tree' \
654 'test 1 = `git rev-list J | wc -l` &&
655 test 0 = `git ls-tree J | wc -l`'
661 cat >input
<<INPUT_END
663 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
668 from refs/heads/branch
671 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
676 from refs/heads/branch^1
679 test_expect_success \
680 'K: reinit branch with from' \
681 'git fast-import <input'
682 test_expect_success \
683 'K: verify K^1 = branch^1' \
684 'test `git rev-parse --verify branch^1` \
685 = `git rev-parse --verify K^1`'
691 cat >input
<<INPUT_END
705 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
715 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
725 cat >expect
<<EXPECT_END
726 :100644 100644 4268632... 55d3a52... M b.
727 :040000 040000 0ae5cac... 443c768... M b
728 :100644 100644 4268632... 55d3a52... M ba
731 test_expect_success \
732 'L: verify internal tree sorting' \
733 'git fast-import <input &&
734 git diff-tree --abbrev --raw L^ L >output &&
735 test_cmp expect output'
737 cat >input
<<INPUT_END
745 committer C O Mitter <committer@example.com> 1112912473 -0700
754 committer C O Mitter <committer@example.com> 1112912473 -0700
768 test_expect_failure \
769 'L: nested tree copy does not corrupt deltas' \
770 'git fast-import <input &&
771 git ls-tree L2 g/b/ >tmp &&
772 cat tmp | cut -f 2 >actual &&
773 test_cmp expect actual &&
774 git fsck `git rev-parse L2`'
776 git update-ref
-d refs
/heads
/L2
783 cat >input
<<INPUT_END
785 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
790 from refs/heads/branch^0
791 R file2/newf file2/n.e.w.f
796 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
798 test_expect_success \
799 'M: rename file in same subdirectory' \
800 'git fast-import <input &&
801 git diff-tree -M -r M1^ M1 >actual &&
802 compare_diff_raw expect actual'
804 cat >input
<<INPUT_END
806 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
811 from refs/heads/branch^0
812 R file2/newf i/am/new/to/you
817 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
819 test_expect_success \
820 'M: rename file to new subdirectory' \
821 'git fast-import <input &&
822 git diff-tree -M -r M2^ M2 >actual &&
823 compare_diff_raw expect actual'
825 cat >input
<<INPUT_END
827 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
838 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
840 test_expect_success \
841 'M: rename subdirectory to new subdirectory' \
842 'git fast-import <input &&
843 git diff-tree -M -r M3^ M3 >actual &&
844 compare_diff_raw expect actual'
851 cat >input
<<INPUT_END
853 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
858 from refs/heads/branch^0
859 C file2/newf file2/n.e.w.f
864 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
866 test_expect_success \
867 'N: copy file in same subdirectory' \
868 'git fast-import <input &&
869 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
870 compare_diff_raw expect actual'
872 cat >input
<<INPUT_END
874 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
879 from refs/heads/branch^0
883 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
885 modify directory copy
888 M 644 inline file3/file5
896 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
897 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
898 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
900 test_expect_success \
901 'N: copy then modify subdirectory' \
902 'git fast-import <input &&
903 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
904 compare_diff_raw expect actual'
906 cat >input
<<INPUT_END
908 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
913 from refs/heads/branch^0
914 M 644 inline file2/file5
924 test_expect_success \
925 'N: copy dirty subdirectory' \
926 'git fast-import <input &&
927 test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
929 test_expect_success \
930 'N: copy directory by id' \
931 'cat >expect <<-\EOF &&
932 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
933 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
935 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
936 cat >input <<-INPUT_END &&
938 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
943 from refs/heads/branch^0
944 M 040000 $subdir file3
946 git fast-import <input &&
947 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
948 compare_diff_raw expect actual'
950 test_expect_success PIPE
'N: read and copy directory' '
952 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
953 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
955 git update-ref -d refs/heads/N4 &&
962 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
964 copy by tree hash, part 2
967 from refs/heads/branch^0
970 read mode type tree filename &&
971 echo "M 040000 $tree file3"
973 git fast-import --cat-blob-fd=3 3>backflow &&
974 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
975 compare_diff_raw expect actual
978 test_expect_success PIPE
'N: empty directory reads as missing' '
979 cat <<-\EOF >expect &&
981 :000000 100644 OBJNAME OBJNAME A unrelated
983 echo "missing src" >expect.response &&
984 git update-ref -d refs/heads/read-empty &&
990 commit refs/heads/read-empty
991 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
993 read "empty" (missing) directory
996 M 100644 inline src/greeting
1000 C src/greeting dst1/non-greeting
1001 C src/greeting unrelated
1002 # leave behind "empty" src directory
1007 printf "%s\n" "$line" >response &&
1013 git fast-import --cat-blob-fd=3 3>backflow &&
1014 test_cmp expect.response response &&
1015 git rev-list read-empty |
1016 git diff-tree -r --root --stdin |
1017 sed "s/$_x40/OBJNAME/g" >actual &&
1018 test_cmp expect actual
1021 test_expect_success \
1022 'N: copy root directory by tree hash' \
1023 'cat >expect <<-\EOF &&
1024 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf
1025 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf
1027 root=$(git rev-parse refs/heads/branch^0^{tree}) &&
1028 cat >input <<-INPUT_END &&
1029 commit refs/heads/N6
1030 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1032 copy root directory by tree hash
1035 from refs/heads/branch^0
1038 git fast-import <input &&
1039 git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
1040 compare_diff_raw expect actual'
1042 test_expect_success \
1043 'N: delete directory by copying' \
1044 'cat >expect <<-\EOF &&
1046 :100644 000000 OBJID OBJID D foo/bar/qux
1048 :000000 100644 OBJID OBJID A foo/bar/baz
1049 :000000 100644 OBJID OBJID A foo/bar/qux
1051 empty_tree=$(git mktree </dev/null) &&
1052 cat >input <<-INPUT_END &&
1053 commit refs/heads/N-delete
1054 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1056 collect data to be deleted
1060 M 100644 inline foo/bar/baz
1064 C "foo/bar/baz" "foo/bar/qux"
1065 C "foo/bar/baz" "foo/bar/quux/1"
1066 C "foo/bar/baz" "foo/bar/quuux"
1067 M 040000 $empty_tree foo/bar/quux
1068 M 040000 $empty_tree foo/bar/quuux
1070 commit refs/heads/N-delete
1071 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1076 M 040000 $empty_tree foo/bar/qux
1078 git fast-import <input &&
1079 git rev-list N-delete |
1080 git diff-tree -r --stdin --root --always |
1081 sed -e "s/$_x40/OBJID/g" >actual &&
1082 test_cmp expect actual'
1084 test_expect_success \
1085 'N: modify copied tree' \
1086 'cat >expect <<-\EOF &&
1087 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
1088 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1089 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1091 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1092 cat >input <<-INPUT_END &&
1093 commit refs/heads/N5
1094 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1099 from refs/heads/branch^0
1100 M 040000 $subdir file3
1102 commit refs/heads/N5
1103 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1105 modify directory copy
1108 M 644 inline file3/file5
1113 git fast-import <input &&
1114 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
1115 compare_diff_raw expect actual'
1117 test_expect_success \
1118 'N: reject foo/ syntax' \
1119 'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1120 test_must_fail git fast-import <<-INPUT_END
1121 commit refs/heads/N5B
1122 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1124 copy with invalid syntax
1127 from refs/heads/branch^0
1128 M 040000 $subdir file3/
1131 test_expect_success \
1132 'N: copy to root by id and modify' \
1133 'echo "hello, world" >expect.foo &&
1134 echo hello >expect.bar &&
1135 git fast-import <<-SETUP_END &&
1136 commit refs/heads/N7
1137 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1143 M 644 inline foo/bar
1149 tree=$(git rev-parse --verify N7:) &&
1150 git fast-import <<-INPUT_END &&
1151 commit refs/heads/N8
1152 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1154 copy to root by id and modify
1158 M 644 inline foo/foo
1163 git show N8:foo/foo >actual.foo &&
1164 git show N8:foo/bar >actual.bar &&
1165 test_cmp expect.foo actual.foo &&
1166 test_cmp expect.bar actual.bar'
1168 test_expect_success \
1169 'N: extract subtree' \
1170 'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1171 cat >input <<-INPUT_END &&
1172 commit refs/heads/N9
1173 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1175 extract subtree branch:newdir
1181 git fast-import <input &&
1182 git diff --exit-code branch:newdir N9'
1184 test_expect_success \
1185 'N: modify subtree, extract it, and modify again' \
1186 'echo hello >expect.baz &&
1187 echo hello, world >expect.qux &&
1188 git fast-import <<-SETUP_END &&
1189 commit refs/heads/N10
1190 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1196 M 644 inline foo/bar/baz
1202 tree=$(git rev-parse --verify N10:) &&
1203 git fast-import <<-INPUT_END &&
1204 commit refs/heads/N11
1205 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1207 copy to root by id and modify
1211 M 100644 inline foo/bar/qux
1216 C "bar/qux" "bar/quux"
1218 git show N11:bar/baz >actual.baz &&
1219 git show N11:bar/qux >actual.qux &&
1220 git show N11:bar/quux >actual.quux &&
1221 test_cmp expect.baz actual.baz &&
1222 test_cmp expect.qux actual.qux &&
1223 test_cmp expect.qux actual.quux'
1229 cat >input
<<INPUT_END
1231 commit refs/heads/O1
1232 # -- ignore all of this text
1233 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1234 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1236 dirty directory copy
1239 # don't forget the import blank line!
1241 # yes, we started from our usual base of branch^0.
1243 from refs/heads/branch^0
1244 # and we need to reuse file2/file5 from N3 above.
1245 M 644 inline file2/file5
1246 # otherwise the tree will be different
1251 # don't forget to copy file2 to file3
1254 # or to delete file5 from file2.
1260 test_expect_success \
1261 'O: comments are all skipped' \
1262 'git fast-import <input &&
1263 test `git rev-parse N3` = `git rev-parse O1`'
1265 cat >input
<<INPUT_END
1266 commit refs/heads/O2
1267 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1269 dirty directory copy
1271 from refs/heads/branch^0
1272 M 644 inline file2/file5
1281 test_expect_success \
1282 'O: blank lines not necessary after data commands' \
1283 'git fast-import <input &&
1284 test `git rev-parse N3` = `git rev-parse O2`'
1286 test_expect_success \
1287 'O: repack before next test' \
1290 cat >input
<<INPUT_END
1291 commit refs/heads/O3
1292 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1296 commit refs/heads/O3
1297 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1302 commit refs/heads/O3
1304 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1309 commit refs/heads/O3
1310 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1314 reset refs/tags/O3-2nd
1316 reset refs/tags/O3-3rd
1320 cat >expect
<<INPUT_END
1326 test_expect_success \
1327 'O: blank lines not necessary after other commands' \
1328 'git fast-import <input &&
1329 test 8 = `find .git/objects/pack -type f | wc -l` &&
1330 test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1331 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1332 test_cmp expect actual'
1334 cat >input
<<INPUT_END
1335 commit refs/heads/O4
1336 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1340 commit refs/heads/O4
1341 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1345 progress Two commits down, 2 to go!
1346 commit refs/heads/O4
1347 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1351 progress Three commits down, 1 to go!
1352 commit refs/heads/O4
1353 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1359 test_expect_success \
1360 'O: progress outputs as requested by input' \
1361 'git fast-import <input >actual &&
1362 grep "progress " <input >expect &&
1363 test_cmp expect actual'
1366 ### series P (gitlinks)
1369 cat >input
<<INPUT_END
1375 reset refs/heads/sub
1376 commit refs/heads/sub
1378 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1391 commit refs/heads/subuse1
1393 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1396 from refs/heads/master
1397 M 100644 :3 .gitmodules
1406 commit refs/heads/sub
1408 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1414 commit refs/heads/subuse1
1416 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1424 test_expect_success \
1425 'P: supermodule & submodule mix' \
1426 'git fast-import <input &&
1427 git checkout subuse1 &&
1428 rm -rf sub && mkdir sub && (cd sub &&
1430 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1431 git checkout master) &&
1432 git submodule init &&
1433 git submodule update'
1435 SUBLAST
=$
(git rev-parse
--verify sub
)
1436 SUBPREV
=$
(git rev-parse
--verify sub^
)
1438 cat >input
<<INPUT_END
1447 commit refs/heads/subuse2
1449 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1452 from refs/heads/master
1453 M 100644 :1 .gitmodules
1454 M 160000 $SUBPREV sub
1456 commit refs/heads/subuse2
1458 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1462 M 160000 $SUBLAST sub
1466 test_expect_success \
1467 'P: verbatim SHA gitlinks' \
1468 'git branch -D sub &&
1469 git gc && git prune &&
1470 git fast-import <input &&
1471 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1474 cat >input
<<INPUT_END
1475 commit refs/heads/subuse3
1477 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1482 from refs/heads/subuse2
1490 test_expect_success
'P: fail on inline gitlink' '
1491 test_must_fail git fast-import <input'
1494 cat >input
<<INPUT_END
1501 commit refs/heads/subuse3
1503 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1508 from refs/heads/subuse2
1513 test_expect_success
'P: fail on blob mark in gitlink' '
1514 test_must_fail git fast-import <input'
1517 ### series Q (notes)
1520 note1_data
="The first note for the first commit"
1521 note2_data
="The first note for the second commit"
1522 note3_data
="The first note for the third commit"
1523 note1b_data
="The second note for the first commit"
1524 note1c_data
="The third note for the first commit"
1525 note2b_data
="The second note for the second commit"
1528 cat >input
<<INPUT_END
1535 commit refs/heads/notes-test
1537 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1548 commit refs/heads/notes-test
1550 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1557 commit refs/heads/notes-test
1559 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1586 commit refs/notes/foobar
1588 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1600 commit refs/notes/foobar
1602 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1612 commit refs/notes/foobar2
1614 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1624 commit refs/notes/foobar
1626 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1639 test_expect_success \
1641 'git fast-import <input &&
1642 git whatchanged notes-test'
1643 test_expect_success \
1645 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1647 commit1
=$
(git rev-parse notes-test~
2)
1648 commit2
=$
(git rev-parse notes-test^
)
1649 commit3
=$
(git rev-parse notes-test
)
1652 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1653 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1657 test_expect_success \
1658 'Q: verify first commit' \
1659 'git cat-file commit notes-test~2 | sed 1d >actual &&
1660 test_cmp expect actual'
1664 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1665 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1669 test_expect_success \
1670 'Q: verify second commit' \
1671 'git cat-file commit notes-test^ | sed 1d >actual &&
1672 test_cmp expect actual'
1676 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1677 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1681 test_expect_success \
1682 'Q: verify third commit' \
1683 'git cat-file commit notes-test | sed 1d >actual &&
1684 test_cmp expect actual'
1687 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1688 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1692 test_expect_success \
1693 'Q: verify first notes commit' \
1694 'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1695 test_cmp expect actual'
1697 cat >expect.unsorted
<<EOF
1698 100644 blob $commit1
1699 100644 blob $commit2
1700 100644 blob $commit3
1702 cat expect.unsorted |
sort >expect
1703 test_expect_success \
1704 'Q: verify first notes tree' \
1705 'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1706 test_cmp expect actual'
1708 echo "$note1_data" >expect
1709 test_expect_success \
1710 'Q: verify first note for first commit' \
1711 'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1713 echo "$note2_data" >expect
1714 test_expect_success \
1715 'Q: verify first note for second commit' \
1716 'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1718 echo "$note3_data" >expect
1719 test_expect_success \
1720 'Q: verify first note for third commit' \
1721 'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1724 parent `git rev-parse --verify refs/notes/foobar~2`
1725 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1726 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1730 test_expect_success \
1731 'Q: verify second notes commit' \
1732 'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1733 test_cmp expect actual'
1735 cat >expect.unsorted
<<EOF
1736 100644 blob $commit1
1737 100644 blob $commit2
1738 100644 blob $commit3
1740 cat expect.unsorted |
sort >expect
1741 test_expect_success \
1742 'Q: verify second notes tree' \
1743 'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1744 test_cmp expect actual'
1746 echo "$note1b_data" >expect
1747 test_expect_success \
1748 'Q: verify second note for first commit' \
1749 'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1751 echo "$note2_data" >expect
1752 test_expect_success \
1753 'Q: verify first note for second commit' \
1754 'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1756 echo "$note3_data" >expect
1757 test_expect_success \
1758 'Q: verify first note for third commit' \
1759 'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1762 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1763 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1767 test_expect_success \
1768 'Q: verify third notes commit' \
1769 'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1770 test_cmp expect actual'
1772 cat >expect.unsorted
<<EOF
1773 100644 blob $commit1
1775 cat expect.unsorted |
sort >expect
1776 test_expect_success \
1777 'Q: verify third notes tree' \
1778 'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1779 test_cmp expect actual'
1781 echo "$note1c_data" >expect
1782 test_expect_success \
1783 'Q: verify third note for first commit' \
1784 'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1787 parent `git rev-parse --verify refs/notes/foobar^`
1788 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1789 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1793 test_expect_success \
1794 'Q: verify fourth notes commit' \
1795 'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1796 test_cmp expect actual'
1798 cat >expect.unsorted
<<EOF
1799 100644 blob $commit2
1801 cat expect.unsorted |
sort >expect
1802 test_expect_success \
1803 'Q: verify fourth notes tree' \
1804 'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1805 test_cmp expect actual'
1807 echo "$note2b_data" >expect
1808 test_expect_success \
1809 'Q: verify second note for second commit' \
1810 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1813 ### series R (feature and option)
1817 feature no-such-feature-exists
1820 test_expect_success
'R: abort on unsupported feature' '
1821 test_must_fail git fast-import <input
1825 feature date-format=now
1828 test_expect_success
'R: supported feature is accepted' '
1829 git fast-import <input
1836 feature date-format=now
1839 test_expect_success
'R: abort on receiving feature after data command' '
1840 test_must_fail git fast-import <input
1844 feature import-marks=git.marks
1845 feature import-marks=git2.marks
1848 test_expect_success
'R: only one import-marks feature allowed per stream' '
1849 test_must_fail git fast-import <input
1853 feature export-marks=git.marks
1861 test_expect_success \
1862 'R: export-marks feature results in a marks file being created' \
1863 'cat input | git fast-import &&
1866 test_expect_success \
1867 'R: export-marks options can be overriden by commandline options' \
1868 'cat input | git fast-import --export-marks=other.marks &&
1869 grep :1 other.marks'
1871 test_expect_success
'R: catch typo in marks file name' '
1872 test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
1873 echo "feature import-marks=nonexistent.marks" |
1874 test_must_fail git fast-import
1877 test_expect_success
'R: import and output marks can be the same file' '
1879 blob=$(echo hi | git hash-object --stdin) &&
1880 cat >expect <<-EOF &&
1884 git fast-import --export-marks=io.marks <<-\EOF &&
1891 git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
1898 test_cmp expect io.marks
1901 test_expect_success
'R: --import-marks=foo --output-marks=foo to create foo fails' '
1903 test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
1912 test_expect_success
'R: --import-marks-if-exists' '
1914 blob=$(echo hi | git hash-object --stdin) &&
1915 echo ":1 $blob" >expect &&
1916 git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
1923 test_cmp expect io.marks
1927 feature import-marks=marks.out
1928 feature export-marks=marks.new
1931 test_expect_success \
1932 'R: import to output marks works without any content' \
1933 'cat input | git fast-import &&
1934 test_cmp marks.out marks.new'
1937 feature import-marks=nonexistent.marks
1938 feature export-marks=marks.new
1941 test_expect_success \
1942 'R: import marks prefers commandline marks file over the stream' \
1943 'cat input | git fast-import --import-marks=marks.out &&
1944 test_cmp marks.out marks.new'
1948 feature import-marks=nonexistent.marks
1949 feature export-marks=combined.marks
1952 test_expect_success
'R: multiple --import-marks= should be honoured' '
1953 head -n2 marks.out > one.marks &&
1954 tail -n +3 marks.out > two.marks &&
1955 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
1956 test_cmp marks.out combined.marks
1960 feature relative-marks
1961 feature import-marks=relative.in
1962 feature export-marks=relative.out
1965 test_expect_success
'R: feature relative-marks should be honoured' '
1966 mkdir -p .git/info/fast-import/ &&
1967 cp marks.new .git/info/fast-import/relative.in &&
1968 git fast-import <input &&
1969 test_cmp marks.new .git/info/fast-import/relative.out
1973 feature relative-marks
1974 feature import-marks=relative.in
1975 feature no-relative-marks
1976 feature export-marks=non-relative.out
1979 test_expect_success
'R: feature no-relative-marks should be honoured' '
1980 git fast-import <input &&
1981 test_cmp marks.new non-relative.out
1984 test_expect_success
'R: feature ls supported' '
1989 test_expect_success
'R: feature cat-blob supported' '
1990 echo "feature cat-blob" |
1994 test_expect_success
'R: cat-blob-fd must be a nonnegative integer' '
1995 test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
1998 test_expect_success
'R: print old blob' '
1999 blob=$(echo "yes it can" | git hash-object -w --stdin) &&
2000 cat >expect <<-EOF &&
2005 echo "cat-blob $blob" |
2006 git fast-import --cat-blob-fd=6 6>actual &&
2007 test_cmp expect actual
2010 test_expect_success
'R: in-stream cat-blob-fd not respected' '
2011 echo hello >greeting &&
2012 blob=$(git hash-object -w greeting) &&
2013 cat >expect <<-EOF &&
2018 git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
2021 test_cmp expect actual.3 &&
2022 test_cmp empty actual.1 &&
2023 git fast-import 3>actual.3 >actual.1 <<-EOF &&
2024 option cat-blob-fd=3
2027 test_cmp empty actual.3 &&
2028 test_cmp expect actual.1
2031 test_expect_success
'R: print new blob' '
2032 blob=$(echo "yep yep yep" | git hash-object --stdin) &&
2033 cat >expect <<-EOF &&
2038 git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2046 test_cmp expect actual
2049 test_expect_success
'R: print new blob by sha1' '
2050 blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
2051 cat >expect <<-EOF &&
2053 a new blob named by sha1
2056 git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
2059 a new blob named by sha1
2063 test_cmp expect actual
2066 test_expect_success
'setup: big file' '
2068 echo "the quick brown fox jumps over the lazy dog" >big &&
2071 cat big big big big >bigger &&
2072 cat bigger bigger bigger bigger >big ||
2078 test_expect_success
'R: print two blobs to stdout' '
2079 blob1=$(git hash-object big) &&
2080 blob1_len=$(wc -c <big) &&
2081 blob2=$(echo hello | git hash-object --stdin) &&
2083 echo ${blob1} blob $blob1_len &&
2093 cat <<-\END_PART1 &&
2110 git fast-import >actual &&
2111 test_cmp expect actual
2114 test_expect_success PIPE
'R: copy using cat-file' '
2115 expect_id=$(git hash-object big) &&
2116 expect_len=$(wc -c <big) &&
2117 echo $expect_id blob $expect_len >expect.response &&
2120 cat >frontend <<-\FRONTEND_END &&
2126 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
2139 read blob_id type size <&3 &&
2140 echo "$blob_id $type $size" >response &&
2141 head_c $size >blob <&3 &&
2145 commit refs/heads/copied
2146 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2148 copy big file as file3
2156 git fast-import --cat-blob-fd=3 3>blobs &&
2157 git show copied:file3 >actual &&
2158 test_cmp expect.response response &&
2162 test_expect_success PIPE
'R: print blob mid-commit' '
2164 echo "A blob from _before_ the commit." >expect &&
2173 A blob from _before_ the commit.
2175 commit refs/heads/temporary
2176 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2183 read blob_id type size <&3 &&
2184 head_c $size >actual <&3 &&
2189 git fast-import --cat-blob-fd=3 3>blobs &&
2190 test_cmp expect actual
2193 test_expect_success PIPE
'R: print staged blob within commit' '
2195 echo "A blob from _within_ the commit." >expect &&
2201 commit refs/heads/within
2202 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2208 A blob from _within_ the commit.
2213 echo "A blob from _within_ the commit." |
2214 git hash-object --stdin
2216 echo "cat-blob $to_get" &&
2218 read blob_id type size <&3 &&
2219 head_c $size >actual <&3 &&
2224 git fast-import --cat-blob-fd=3 3>blobs &&
2225 test_cmp expect actual
2236 test_expect_success
'R: quiet option results in no stats being output' '
2237 cat input | git fast-import 2> output &&
2238 test_cmp empty output
2242 option git non-existing-option
2245 test_expect_success
'R: die on unknown option' '
2246 test_must_fail git fast-import <input
2249 test_expect_success
'R: unknown commandline options are rejected' '\
2250 test_must_fail git fast-import --non-existing-option < /dev/null
2253 test_expect_success
'R: die on invalid option argument' '
2254 echo "option git active-branches=-5" |
2255 test_must_fail git fast-import &&
2256 echo "option git depth=" |
2257 test_must_fail git fast-import &&
2258 test_must_fail git fast-import --depth="5 elephants" </dev/null
2262 option non-existing-vcs non-existing-option
2265 test_expect_success
'R: ignore non-git options' '
2266 git fast-import <input
2270 ## R: very large blobs
2272 blobsize
=$
((2*1024*1024 + 53))
2273 test-genrandom bar
$blobsize >expect
2274 cat >input
<<INPUT_END
2275 commit refs/heads/big-file
2276 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2285 cat >>input
<<INPUT_END
2292 test_expect_success \
2293 'R: blob bigger than threshold' \
2294 'test_create_repo R &&
2295 git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
2296 test_expect_success \
2297 'R: verify created pack' \
2299 for p in R/.git/objects/pack/*.pack;
2301 git verify-pack -v $p >>verify || exit;
2303 test_expect_success \
2304 'R: verify written objects' \
2305 'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2306 test_cmp expect actual &&
2307 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2308 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2310 test_expect_success \
2311 'R: blob appears only once' \
2312 'n=$(grep $a verify | wc -l) &&