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
100 An annotated tag that annotates a blob.
104 test_expect_success \
105 'A: create pack from stdin' \
106 'git fast-import --export-marks=marks.out <input &&
107 git whatchanged master'
108 test_expect_success \
110 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
113 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
114 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
118 test_expect_success \
120 'git cat-file commit master | sed 1d >actual &&
121 test_cmp expect actual'
128 test_expect_success \
130 'git cat-file -p master^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
131 test_cmp expect actual'
133 echo "$file2_data" >expect
134 test_expect_success \
136 'git cat-file blob master:file2 >actual && test_cmp expect actual'
138 echo "$file3_data" >expect
139 test_expect_success \
141 'git cat-file blob master:file3 >actual && test_cmp expect actual'
143 printf "$file4_data" >expect
144 test_expect_success \
146 'git cat-file blob master:file4 >actual && test_cmp expect actual'
149 object $(git rev-parse refs/heads/master)
153 An annotated tag without a tagger
155 test_expect_success
'A: verify tag/series-A' '
156 git cat-file tag tags/series-A >actual &&
157 test_cmp expect actual
161 object $(git rev-parse refs/heads/master:file3)
165 An annotated tag that annotates a blob.
167 test_expect_success
'A: verify tag/series-A-blob' '
168 git cat-file tag tags/series-A-blob >actual &&
169 test_cmp expect actual
173 :2 `git rev-parse --verify master:file2`
174 :3 `git rev-parse --verify master:file3`
175 :4 `git rev-parse --verify master:file4`
176 :5 `git rev-parse --verify master^0`
178 test_expect_success \
179 'A: verify marks output' \
180 'test_cmp expect marks.out'
182 test_expect_success \
183 'A: verify marks import' \
185 --import-marks=marks.out \
186 --export-marks=marks.new \
188 test_cmp expect marks.new'
191 new_blob
=$
(echo testing | git hash-object
--stdin)
192 cat >input
<<INPUT_END
194 from $(git rev-parse refs/heads/master:file3)
205 commit refs/heads/new_blob
209 #pretend we got sha1 from fast-import
220 object $(git rev-parse refs/heads/master:file3)
232 test_expect_success \
233 'A: tag blob by sha1' \
234 'git fast-import <input &&
235 git cat-file tag tags/series-A-blob-2 >actual &&
236 git cat-file tag tags/series-A-blob-3 >>actual &&
237 test_cmp expect actual'
240 cat >input
<<INPUT_END
241 commit refs/heads/verify--import-marks
242 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
248 M 755 :2 copy-of-file2
251 test_expect_success \
252 'A: verify marks import does not crash' \
253 'git fast-import --import-marks=marks.out <input &&
254 git whatchanged verify--import-marks'
255 test_expect_success \
257 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
259 :000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A copy-of-file2
261 git diff-tree
-M -r master verify--import-marks
>actual
262 test_expect_success \
264 'compare_diff_raw expect actual &&
265 test `git rev-parse --verify master:file2` \
266 = `git rev-parse --verify verify--import-marks:copy-of-file2`'
269 mt
=$
(git hash-object
--stdin < /dev
/null
)
274 cat >input.commit
<<EOF
275 commit refs/heads/verify--dump-marks
276 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
278 test the sparse array dumping routines with exponentially growing marks
286 while test "$i" -lt 27; do
287 cat >>input.blob
<<EOF
298 echo "M 100644 :$l l$i" >>input.commit
299 echo "M 100644 :$m m$i" >>input.commit
300 echo "M 100644 :$n n$i" >>input.commit
302 echo ":$l $mt" >>marks.exp
303 echo ":$m $mt" >>marks.exp
304 echo ":$n $mt" >>marks.exp
306 printf "100644 blob $mt\tl$i\n" >>tree.exp
307 printf "100644 blob $mt\tm$i\n" >>tree.exp
308 printf "100644 blob $mt\tn$i\n" >>tree.exp
317 sort tree.exp
> tree.exp_s
319 test_expect_success
'A: export marks with large values' '
320 cat input.blob input.commit | git fast-import --export-marks=marks.large &&
321 git ls-tree refs/heads/verify--dump-marks >tree.out &&
322 test_cmp tree.exp_s tree.out &&
323 test_cmp marks.exp marks.large'
330 cat >input
<<INPUT_END
331 commit refs/heads/branch
333 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
338 from refs/heads/master
339 M 755 0000000000000000000000000000000000000001 zero1
342 test_expect_success
'B: fail on invalid blob sha1' '
343 test_must_fail git fast-import <input
345 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
347 cat >input
<<INPUT_END
348 commit .badbranchname
349 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
354 from refs/heads/master
357 test_expect_success
'B: fail on invalid branch name ".badbranchname"' '
358 test_must_fail git fast-import <input
360 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
362 cat >input
<<INPUT_END
363 commit bad[branch]name
364 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
369 from refs/heads/master
372 test_expect_success
'B: fail on invalid branch name "bad[branch]name"' '
373 test_must_fail git fast-import <input
375 rm -f .git
/objects
/pack_
* .git
/objects
/index_
*
377 cat >input
<<INPUT_END
379 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
384 from refs/heads/master
387 test_expect_success \
388 'B: accept branch name "TEMP_TAG"' \
389 'git fast-import <input &&
390 test -f .git/TEMP_TAG &&
391 test `git rev-parse master` = `git rev-parse TEMP_TAG^`'
394 git gc
2>/dev
/null
>/dev
/null
395 git prune
2>/dev
/null
>/dev
/null
397 cat >input
<<INPUT_END
398 commit refs/heads/empty-committer-1
399 committer <> $GIT_COMMITTER_DATE
404 test_expect_success
'B: accept empty committer' '
405 git fast-import <input &&
410 git update-ref
-d refs
/heads
/empty-committer-1 || true
412 git gc
2>/dev
/null
>/dev
/null
413 git prune
2>/dev
/null
>/dev
/null
415 cat >input
<<INPUT_END
416 commit refs/heads/empty-committer-2
417 committer <a@b.com> $GIT_COMMITTER_DATE
422 test_expect_success
'B: accept and fixup committer with no name' '
423 git fast-import <input &&
428 git update-ref
-d refs
/heads
/empty-committer-2 || true
430 git gc
2>/dev
/null
>/dev
/null
431 git prune
2>/dev
/null
>/dev
/null
433 cat >input
<<INPUT_END
434 commit refs/heads/invalid-committer
435 committer Name email> $GIT_COMMITTER_DATE
440 test_expect_success
'B: fail on invalid committer (1)' '
441 test_must_fail git fast-import <input
443 git update-ref
-d refs
/heads
/invalid-committer || true
445 cat >input
<<INPUT_END
446 commit refs/heads/invalid-committer
447 committer Name <e<mail> $GIT_COMMITTER_DATE
452 test_expect_success
'B: fail on invalid committer (2)' '
453 test_must_fail git fast-import <input
455 git update-ref
-d refs
/heads
/invalid-committer || true
457 cat >input
<<INPUT_END
458 commit refs/heads/invalid-committer
459 committer Name <email>> $GIT_COMMITTER_DATE
464 test_expect_success
'B: fail on invalid committer (3)' '
465 test_must_fail git fast-import <input
467 git update-ref
-d refs
/heads
/invalid-committer || true
469 cat >input
<<INPUT_END
470 commit refs/heads/invalid-committer
471 committer Name <email $GIT_COMMITTER_DATE
476 test_expect_success
'B: fail on invalid committer (4)' '
477 test_must_fail git fast-import <input
479 git update-ref
-d refs
/heads
/invalid-committer || true
481 cat >input
<<INPUT_END
482 commit refs/heads/invalid-committer
483 committer Name<email> $GIT_COMMITTER_DATE
488 test_expect_success
'B: fail on invalid committer (5)' '
489 test_must_fail git fast-import <input
491 git update-ref
-d refs
/heads
/invalid-committer || true
497 newf
=`echo hi newf | git hash-object -w --stdin`
498 oldf
=`git rev-parse --verify master:file2`
500 cat >input
<<INPUT_END
501 commit refs/heads/branch
502 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
507 from refs/heads/master
508 M 644 $oldf file2/oldf
509 M 755 $newf file2/newf
513 test_expect_success \
514 'C: incremental import create pack from stdin' \
515 'git fast-import <input &&
516 git whatchanged branch'
517 test_expect_success \
519 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
520 test_expect_success \
521 'C: validate reuse existing blob' \
522 'test $newf = `git rev-parse --verify branch:file2/newf` &&
523 test $oldf = `git rev-parse --verify branch:file2/oldf`'
526 parent `git rev-parse --verify master^0`
527 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
528 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
532 test_expect_success \
534 'git cat-file commit branch | sed 1d >actual &&
535 test_cmp expect actual'
538 :000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A file2/newf
539 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100 file2 file2/oldf
540 :100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D file3
542 git diff-tree
-M -r master branch
>actual
543 test_expect_success \
544 'C: validate rename result' \
545 'compare_diff_raw expect actual'
552 cat >input
<<INPUT_END
553 commit refs/heads/branch
554 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
559 from refs/heads/branch^0
560 M 644 inline newdir/interesting
565 M 755 inline newdir/exec.sh
571 test_expect_success \
572 'D: inline data in commit' \
573 'git fast-import <input &&
574 git whatchanged branch'
575 test_expect_success \
577 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
580 :000000 100755 0000000000000000000000000000000000000000 35a59026a33beac1569b1c7f66f3090ce9c09afc A newdir/exec.sh
581 :000000 100644 0000000000000000000000000000000000000000 046d0371e9220107917db0d0e030628de8a1de9b A newdir/interesting
583 git diff-tree
-M -r branch^ branch
>actual
584 test_expect_success \
585 'D: validate new files added' \
586 'compare_diff_raw expect actual'
588 echo "$file5_data" >expect
589 test_expect_success \
591 'git cat-file blob branch:newdir/interesting >actual &&
592 test_cmp expect actual'
594 echo "$file6_data" >expect
595 test_expect_success \
597 'git cat-file blob branch:newdir/exec.sh >actual &&
598 test_cmp expect actual'
604 cat >input
<<INPUT_END
605 commit refs/heads/branch
606 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500
607 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500
612 from refs/heads/branch^0
615 test_expect_success
'E: rfc2822 date, --date-format=raw' '
616 test_must_fail git fast-import --date-format=raw <input
618 test_expect_success \
619 'E: rfc2822 date, --date-format=rfc2822' \
620 'git fast-import --date-format=rfc2822 <input'
621 test_expect_success \
623 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
626 author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500
627 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500
631 test_expect_success \
633 'git cat-file commit branch | sed 1,2d >actual &&
634 test_cmp expect actual'
640 old_branch
=`git rev-parse --verify branch^0`
642 cat >input
<<INPUT_END
643 commit refs/heads/branch
644 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
646 losing things already?
649 from refs/heads/branch~1
651 reset refs/heads/other
652 from refs/heads/branch
655 test_expect_success \
656 'F: non-fast-forward update skips' \
657 'if git fast-import <input
659 echo BAD gfi did not fail
662 if test $old_branch = `git rev-parse --verify branch^0`
664 : branch unaffected and failure returned
667 echo BAD gfi changed branch $old_branch
672 test_expect_success \
674 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
677 tree `git rev-parse branch~1^{tree}`
678 parent `git rev-parse branch~1`
679 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
680 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
682 losing things already?
684 test_expect_success \
685 'F: verify other commit' \
686 'git cat-file commit other >actual &&
687 test_cmp expect actual'
693 old_branch
=`git rev-parse --verify branch^0`
695 cat >input
<<INPUT_END
696 commit refs/heads/branch
697 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
699 losing things already?
702 from refs/heads/branch~1
705 test_expect_success \
706 'G: non-fast-forward update forced' \
707 'git fast-import --force <input'
708 test_expect_success \
710 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
711 test_expect_success \
712 'G: branch changed, but logged' \
713 'test $old_branch != `git rev-parse --verify branch^0` &&
714 test $old_branch = `git rev-parse --verify branch@{1}`'
721 cat >input
<<INPUT_END
723 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
728 from refs/heads/branch^0
729 M 644 inline i-will-die
731 this file will never exist.
735 M 644 inline h/e/l/lo
741 test_expect_success \
742 'H: deletall, add 1' \
743 'git fast-import <input &&
745 test_expect_success \
747 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
750 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file2/newf
751 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file2/oldf
752 :100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D file4
753 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100 newdir/interesting h/e/l/lo
754 :100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D newdir/exec.sh
756 git diff-tree
-M -r H^ H
>actual
757 test_expect_success \
758 'H: validate old files removed, new files added' \
759 'compare_diff_raw expect actual'
761 echo "$file5_data" >expect
762 test_expect_success \
764 'git cat-file blob H:h/e/l/lo >actual &&
765 test_cmp expect actual'
771 cat >input
<<INPUT_END
772 commit refs/heads/export-boundary
773 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
775 we have a border. its only 40 characters wide.
778 from refs/heads/branch
781 test_expect_success \
782 'I: export-pack-edges' \
783 'git fast-import --export-pack-edges=edges.list <input'
786 .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`
788 test_expect_success \
789 'I: verify edge list' \
790 'sed -e s/pack-.*pack/pack-.pack/ edges.list >actual &&
791 test_cmp expect actual'
797 cat >input
<<INPUT_END
799 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
804 from refs/heads/branch
809 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
815 test_expect_success \
816 'J: reset existing branch creates empty commit' \
817 'git fast-import <input'
818 test_expect_success \
819 'J: branch has 1 commit, empty tree' \
820 'test 1 = `git rev-list J | wc -l` &&
821 test 0 = `git ls-tree J | wc -l`'
823 cat >input
<<INPUT_END
829 Tag branch that was reset.
832 test_expect_success \
833 'J: tag must fail on empty branch' \
834 'test_must_fail git fast-import <input'
839 cat >input
<<INPUT_END
841 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
846 from refs/heads/branch
849 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
854 from refs/heads/branch^1
857 test_expect_success \
858 'K: reinit branch with from' \
859 'git fast-import <input'
860 test_expect_success \
861 'K: verify K^1 = branch^1' \
862 'test `git rev-parse --verify branch^1` \
863 = `git rev-parse --verify K^1`'
869 cat >input
<<INPUT_END
883 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
893 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
903 cat >expect
<<EXPECT_END
904 :100644 100644 4268632... 55d3a52... M b.
905 :040000 040000 0ae5cac... 443c768... M b
906 :100644 100644 4268632... 55d3a52... M ba
909 test_expect_success \
910 'L: verify internal tree sorting' \
911 'git fast-import <input &&
912 git diff-tree --abbrev --raw L^ L >output &&
913 test_cmp expect output'
915 cat >input
<<INPUT_END
923 committer C O Mitter <committer@example.com> 1112912473 -0700
932 committer C O Mitter <committer@example.com> 1112912473 -0700
946 test_expect_success \
947 'L: nested tree copy does not corrupt deltas' \
948 'git fast-import <input &&
949 git ls-tree L2 g/b/ >tmp &&
950 cat tmp | cut -f 2 >actual &&
951 test_cmp expect actual &&
952 git fsck `git rev-parse L2`'
954 git update-ref
-d refs
/heads
/L2
961 cat >input
<<INPUT_END
963 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
968 from refs/heads/branch^0
969 R file2/newf file2/n.e.w.f
974 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf file2/n.e.w.f
976 test_expect_success \
977 'M: rename file in same subdirectory' \
978 'git fast-import <input &&
979 git diff-tree -M -r M1^ M1 >actual &&
980 compare_diff_raw expect actual'
982 cat >input
<<INPUT_END
984 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
989 from refs/heads/branch^0
990 R file2/newf i/am/new/to/you
995 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 file2/newf i/am/new/to/you
997 test_expect_success \
998 'M: rename file to new subdirectory' \
999 'git fast-import <input &&
1000 git diff-tree -M -r M2^ M2 >actual &&
1001 compare_diff_raw expect actual'
1003 cat >input
<<INPUT_END
1004 commit refs/heads/M3
1005 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1010 from refs/heads/M2^0
1016 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100 i/am/new/to/you other/sub/am/new/to/you
1018 test_expect_success \
1019 'M: rename subdirectory to new subdirectory' \
1020 'git fast-import <input &&
1021 git diff-tree -M -r M3^ M3 >actual &&
1022 compare_diff_raw expect actual'
1029 cat >input
<<INPUT_END
1030 commit refs/heads/N1
1031 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1036 from refs/heads/branch^0
1037 C file2/newf file2/n.e.w.f
1042 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file2/n.e.w.f
1044 test_expect_success \
1045 'N: copy file in same subdirectory' \
1046 'git fast-import <input &&
1047 git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
1048 compare_diff_raw expect actual'
1050 cat >input
<<INPUT_END
1051 commit refs/heads/N2
1052 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1054 clean directory copy
1057 from refs/heads/branch^0
1060 commit refs/heads/N2
1061 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1063 modify directory copy
1066 M 644 inline file3/file5
1074 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
1075 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1076 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1078 test_expect_success \
1079 'N: copy then modify subdirectory' \
1080 'git fast-import <input &&
1081 git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
1082 compare_diff_raw expect actual'
1084 cat >input
<<INPUT_END
1085 commit refs/heads/N3
1086 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1088 dirty directory copy
1091 from refs/heads/branch^0
1092 M 644 inline file2/file5
1102 test_expect_success \
1103 'N: copy dirty subdirectory' \
1104 'git fast-import <input &&
1105 test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'
1107 test_expect_success \
1108 'N: copy directory by id' \
1109 'cat >expect <<-\EOF &&
1110 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1111 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1113 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1114 cat >input <<-INPUT_END &&
1115 commit refs/heads/N4
1116 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1121 from refs/heads/branch^0
1122 M 040000 $subdir file3
1124 git fast-import <input &&
1125 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1126 compare_diff_raw expect actual'
1128 test_expect_success PIPE
'N: read and copy directory' '
1130 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1131 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1133 git update-ref -d refs/heads/N4 &&
1139 commit refs/heads/N4
1140 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1142 copy by tree hash, part 2
1145 from refs/heads/branch^0
1148 read mode type tree filename &&
1149 echo "M 040000 $tree file3"
1151 git fast-import --cat-blob-fd=3 3>backflow &&
1152 git diff-tree -C --find-copies-harder -r N4^ N4 >actual &&
1153 compare_diff_raw expect actual
1156 test_expect_success PIPE
'N: empty directory reads as missing' '
1157 cat <<-\EOF >expect &&
1159 :000000 100644 OBJNAME OBJNAME A unrelated
1161 echo "missing src" >expect.response &&
1162 git update-ref -d refs/heads/read-empty &&
1168 commit refs/heads/read-empty
1169 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1171 read "empty" (missing) directory
1174 M 100644 inline src/greeting
1178 C src/greeting dst1/non-greeting
1179 C src/greeting unrelated
1180 # leave behind "empty" src directory
1185 printf "%s\n" "$line" >response &&
1191 git fast-import --cat-blob-fd=3 3>backflow &&
1192 test_cmp expect.response response &&
1193 git rev-list read-empty |
1194 git diff-tree -r --root --stdin |
1195 sed "s/$_x40/OBJNAME/g" >actual &&
1196 test_cmp expect actual
1199 test_expect_success \
1200 'N: copy root directory by tree hash' \
1201 'cat >expect <<-\EOF &&
1202 :100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D file3/newf
1203 :100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D file3/oldf
1205 root=$(git rev-parse refs/heads/branch^0^{tree}) &&
1206 cat >input <<-INPUT_END &&
1207 commit refs/heads/N6
1208 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1210 copy root directory by tree hash
1213 from refs/heads/branch^0
1216 git fast-import <input &&
1217 git diff-tree -C --find-copies-harder -r N4 N6 >actual &&
1218 compare_diff_raw expect actual'
1220 test_expect_success \
1221 'N: delete directory by copying' \
1222 'cat >expect <<-\EOF &&
1224 :100644 000000 OBJID OBJID D foo/bar/qux
1226 :000000 100644 OBJID OBJID A foo/bar/baz
1227 :000000 100644 OBJID OBJID A foo/bar/qux
1229 empty_tree=$(git mktree </dev/null) &&
1230 cat >input <<-INPUT_END &&
1231 commit refs/heads/N-delete
1232 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1234 collect data to be deleted
1238 M 100644 inline foo/bar/baz
1242 C "foo/bar/baz" "foo/bar/qux"
1243 C "foo/bar/baz" "foo/bar/quux/1"
1244 C "foo/bar/baz" "foo/bar/quuux"
1245 M 040000 $empty_tree foo/bar/quux
1246 M 040000 $empty_tree foo/bar/quuux
1248 commit refs/heads/N-delete
1249 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1254 M 040000 $empty_tree foo/bar/qux
1256 git fast-import <input &&
1257 git rev-list N-delete |
1258 git diff-tree -r --stdin --root --always |
1259 sed -e "s/$_x40/OBJID/g" >actual &&
1260 test_cmp expect actual'
1262 test_expect_success \
1263 'N: modify copied tree' \
1264 'cat >expect <<-\EOF &&
1265 :100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100 newdir/interesting file3/file5
1266 :100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100 file2/newf file3/newf
1267 :100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100 file2/oldf file3/oldf
1269 subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1270 cat >input <<-INPUT_END &&
1271 commit refs/heads/N5
1272 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1277 from refs/heads/branch^0
1278 M 040000 $subdir file3
1280 commit refs/heads/N5
1281 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1283 modify directory copy
1286 M 644 inline file3/file5
1291 git fast-import <input &&
1292 git diff-tree -C --find-copies-harder -r N5^^ N5 >actual &&
1293 compare_diff_raw expect actual'
1295 test_expect_success \
1296 'N: reject foo/ syntax' \
1297 'subdir=$(git rev-parse refs/heads/branch^0:file2) &&
1298 test_must_fail git fast-import <<-INPUT_END
1299 commit refs/heads/N5B
1300 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1302 copy with invalid syntax
1305 from refs/heads/branch^0
1306 M 040000 $subdir file3/
1309 test_expect_success \
1310 'N: copy to root by id and modify' \
1311 'echo "hello, world" >expect.foo &&
1312 echo hello >expect.bar &&
1313 git fast-import <<-SETUP_END &&
1314 commit refs/heads/N7
1315 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1321 M 644 inline foo/bar
1327 tree=$(git rev-parse --verify N7:) &&
1328 git fast-import <<-INPUT_END &&
1329 commit refs/heads/N8
1330 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1332 copy to root by id and modify
1336 M 644 inline foo/foo
1341 git show N8:foo/foo >actual.foo &&
1342 git show N8:foo/bar >actual.bar &&
1343 test_cmp expect.foo actual.foo &&
1344 test_cmp expect.bar actual.bar'
1346 test_expect_success \
1347 'N: extract subtree' \
1348 'branch=$(git rev-parse --verify refs/heads/branch^{tree}) &&
1349 cat >input <<-INPUT_END &&
1350 commit refs/heads/N9
1351 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1353 extract subtree branch:newdir
1359 git fast-import <input &&
1360 git diff --exit-code branch:newdir N9'
1362 test_expect_success \
1363 'N: modify subtree, extract it, and modify again' \
1364 'echo hello >expect.baz &&
1365 echo hello, world >expect.qux &&
1366 git fast-import <<-SETUP_END &&
1367 commit refs/heads/N10
1368 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1374 M 644 inline foo/bar/baz
1380 tree=$(git rev-parse --verify N10:) &&
1381 git fast-import <<-INPUT_END &&
1382 commit refs/heads/N11
1383 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1385 copy to root by id and modify
1389 M 100644 inline foo/bar/qux
1394 C "bar/qux" "bar/quux"
1396 git show N11:bar/baz >actual.baz &&
1397 git show N11:bar/qux >actual.qux &&
1398 git show N11:bar/quux >actual.quux &&
1399 test_cmp expect.baz actual.baz &&
1400 test_cmp expect.qux actual.qux &&
1401 test_cmp expect.qux actual.quux'
1407 cat >input
<<INPUT_END
1409 commit refs/heads/O1
1410 # -- ignore all of this text
1411 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1412 # $GIT_COMMITTER_NAME has inserted here for his benefit.
1414 dirty directory copy
1417 # don't forget the import blank line!
1419 # yes, we started from our usual base of branch^0.
1421 from refs/heads/branch^0
1422 # and we need to reuse file2/file5 from N3 above.
1423 M 644 inline file2/file5
1424 # otherwise the tree will be different
1429 # don't forget to copy file2 to file3
1432 # or to delete file5 from file2.
1438 test_expect_success \
1439 'O: comments are all skipped' \
1440 'git fast-import <input &&
1441 test `git rev-parse N3` = `git rev-parse O1`'
1443 cat >input
<<INPUT_END
1444 commit refs/heads/O2
1445 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1447 dirty directory copy
1449 from refs/heads/branch^0
1450 M 644 inline file2/file5
1459 test_expect_success \
1460 'O: blank lines not necessary after data commands' \
1461 'git fast-import <input &&
1462 test `git rev-parse N3` = `git rev-parse O2`'
1464 test_expect_success \
1465 'O: repack before next test' \
1468 cat >input
<<INPUT_END
1469 commit refs/heads/O3
1470 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1474 commit refs/heads/O3
1475 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1480 commit refs/heads/O3
1482 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1487 commit refs/heads/O3
1488 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1492 reset refs/tags/O3-2nd
1494 reset refs/tags/O3-3rd
1498 cat >expect
<<INPUT_END
1504 test_expect_success \
1505 'O: blank lines not necessary after other commands' \
1506 'git fast-import <input &&
1507 test 8 = `find .git/objects/pack -type f | wc -l` &&
1508 test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&
1509 git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
1510 test_cmp expect actual'
1512 cat >input
<<INPUT_END
1513 commit refs/heads/O4
1514 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1518 commit refs/heads/O4
1519 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1523 progress Two commits down, 2 to go!
1524 commit refs/heads/O4
1525 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1529 progress Three commits down, 1 to go!
1530 commit refs/heads/O4
1531 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1537 test_expect_success \
1538 'O: progress outputs as requested by input' \
1539 'git fast-import <input >actual &&
1540 grep "progress " <input >expect &&
1541 test_cmp expect actual'
1544 ### series P (gitlinks)
1547 cat >input
<<INPUT_END
1553 reset refs/heads/sub
1554 commit refs/heads/sub
1556 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1569 commit refs/heads/subuse1
1571 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1574 from refs/heads/master
1575 M 100644 :3 .gitmodules
1584 commit refs/heads/sub
1586 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1592 commit refs/heads/subuse1
1594 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1602 test_expect_success \
1603 'P: supermodule & submodule mix' \
1604 'git fast-import <input &&
1605 git checkout subuse1 &&
1606 rm -rf sub && mkdir sub && (cd sub &&
1608 git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1609 git checkout master) &&
1610 git submodule init &&
1611 git submodule update'
1613 SUBLAST
=$
(git rev-parse
--verify sub
)
1614 SUBPREV
=$
(git rev-parse
--verify sub^
)
1616 cat >input
<<INPUT_END
1625 commit refs/heads/subuse2
1627 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1630 from refs/heads/master
1631 M 100644 :1 .gitmodules
1632 M 160000 $SUBPREV sub
1634 commit refs/heads/subuse2
1636 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1640 M 160000 $SUBLAST sub
1644 test_expect_success \
1645 'P: verbatim SHA gitlinks' \
1646 'git branch -D sub &&
1647 git gc && git prune &&
1648 git fast-import <input &&
1649 test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'
1652 cat >input
<<INPUT_END
1653 commit refs/heads/subuse3
1655 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1660 from refs/heads/subuse2
1668 test_expect_success
'P: fail on inline gitlink' '
1669 test_must_fail git fast-import <input'
1672 cat >input
<<INPUT_END
1679 commit refs/heads/subuse3
1681 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1686 from refs/heads/subuse2
1691 test_expect_success
'P: fail on blob mark in gitlink' '
1692 test_must_fail git fast-import <input'
1695 ### series Q (notes)
1698 note1_data
="The first note for the first commit"
1699 note2_data
="The first note for the second commit"
1700 note3_data
="The first note for the third commit"
1701 note1b_data
="The second note for the first commit"
1702 note1c_data
="The third note for the first commit"
1703 note2b_data
="The second note for the second commit"
1706 cat >input
<<INPUT_END
1713 commit refs/heads/notes-test
1715 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1726 commit refs/heads/notes-test
1728 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1735 commit refs/heads/notes-test
1737 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1764 commit refs/notes/foobar
1766 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1778 commit refs/notes/foobar
1780 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1790 commit refs/notes/foobar2
1792 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1802 commit refs/notes/foobar
1804 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1817 test_expect_success \
1819 'git fast-import <input &&
1820 git whatchanged notes-test'
1821 test_expect_success \
1823 'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'
1825 commit1
=$
(git rev-parse notes-test~
2)
1826 commit2
=$
(git rev-parse notes-test^
)
1827 commit3
=$
(git rev-parse notes-test
)
1830 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1831 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1835 test_expect_success \
1836 'Q: verify first commit' \
1837 'git cat-file commit notes-test~2 | sed 1d >actual &&
1838 test_cmp expect actual'
1842 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1843 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1847 test_expect_success \
1848 'Q: verify second commit' \
1849 'git cat-file commit notes-test^ | sed 1d >actual &&
1850 test_cmp expect actual'
1854 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1855 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1859 test_expect_success \
1860 'Q: verify third commit' \
1861 'git cat-file commit notes-test | sed 1d >actual &&
1862 test_cmp expect actual'
1865 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1866 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1870 test_expect_success \
1871 'Q: verify first notes commit' \
1872 'git cat-file commit refs/notes/foobar~2 | sed 1d >actual &&
1873 test_cmp expect actual'
1875 cat >expect.unsorted
<<EOF
1876 100644 blob $commit1
1877 100644 blob $commit2
1878 100644 blob $commit3
1880 cat expect.unsorted |
sort >expect
1881 test_expect_success \
1882 'Q: verify first notes tree' \
1883 'git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1884 test_cmp expect actual'
1886 echo "$note1_data" >expect
1887 test_expect_success \
1888 'Q: verify first note for first commit' \
1889 'git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual'
1891 echo "$note2_data" >expect
1892 test_expect_success \
1893 'Q: verify first note for second commit' \
1894 'git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual'
1896 echo "$note3_data" >expect
1897 test_expect_success \
1898 'Q: verify first note for third commit' \
1899 'git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual'
1902 parent `git rev-parse --verify refs/notes/foobar~2`
1903 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1904 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1908 test_expect_success \
1909 'Q: verify second notes commit' \
1910 'git cat-file commit refs/notes/foobar^ | sed 1d >actual &&
1911 test_cmp expect actual'
1913 cat >expect.unsorted
<<EOF
1914 100644 blob $commit1
1915 100644 blob $commit2
1916 100644 blob $commit3
1918 cat expect.unsorted |
sort >expect
1919 test_expect_success \
1920 'Q: verify second notes tree' \
1921 'git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1922 test_cmp expect actual'
1924 echo "$note1b_data" >expect
1925 test_expect_success \
1926 'Q: verify second note for first commit' \
1927 'git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual'
1929 echo "$note2_data" >expect
1930 test_expect_success \
1931 'Q: verify first note for second commit' \
1932 'git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual'
1934 echo "$note3_data" >expect
1935 test_expect_success \
1936 'Q: verify first note for third commit' \
1937 'git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual'
1940 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1941 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1945 test_expect_success \
1946 'Q: verify third notes commit' \
1947 'git cat-file commit refs/notes/foobar2 | sed 1d >actual &&
1948 test_cmp expect actual'
1950 cat >expect.unsorted
<<EOF
1951 100644 blob $commit1
1953 cat expect.unsorted |
sort >expect
1954 test_expect_success \
1955 'Q: verify third notes tree' \
1956 'git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1957 test_cmp expect actual'
1959 echo "$note1c_data" >expect
1960 test_expect_success \
1961 'Q: verify third note for first commit' \
1962 'git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual'
1965 parent `git rev-parse --verify refs/notes/foobar^`
1966 author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1967 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
1971 test_expect_success \
1972 'Q: verify fourth notes commit' \
1973 'git cat-file commit refs/notes/foobar | sed 1d >actual &&
1974 test_cmp expect actual'
1976 cat >expect.unsorted
<<EOF
1977 100644 blob $commit2
1979 cat expect.unsorted |
sort >expect
1980 test_expect_success \
1981 'Q: verify fourth notes tree' \
1982 'git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual &&
1983 test_cmp expect actual'
1985 echo "$note2b_data" >expect
1986 test_expect_success \
1987 'Q: verify second note for second commit' \
1988 'git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual'
1991 ### series R (feature and option)
1995 feature no-such-feature-exists
1998 test_expect_success
'R: abort on unsupported feature' '
1999 test_must_fail git fast-import <input
2003 feature date-format=now
2006 test_expect_success
'R: supported feature is accepted' '
2007 git fast-import <input
2014 feature date-format=now
2017 test_expect_success
'R: abort on receiving feature after data command' '
2018 test_must_fail git fast-import <input
2022 feature import-marks=git.marks
2023 feature import-marks=git2.marks
2026 test_expect_success
'R: only one import-marks feature allowed per stream' '
2027 test_must_fail git fast-import <input
2031 feature export-marks=git.marks
2039 test_expect_success \
2040 'R: export-marks feature results in a marks file being created' \
2041 'cat input | git fast-import &&
2044 test_expect_success \
2045 'R: export-marks options can be overriden by commandline options' \
2046 'cat input | git fast-import --export-marks=other.marks &&
2047 grep :1 other.marks'
2049 test_expect_success
'R: catch typo in marks file name' '
2050 test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
2051 echo "feature import-marks=nonexistent.marks" |
2052 test_must_fail git fast-import
2055 test_expect_success
'R: import and output marks can be the same file' '
2057 blob=$(echo hi | git hash-object --stdin) &&
2058 cat >expect <<-EOF &&
2062 git fast-import --export-marks=io.marks <<-\EOF &&
2069 git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF &&
2076 test_cmp expect io.marks
2079 test_expect_success
'R: --import-marks=foo --output-marks=foo to create foo fails' '
2081 test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF
2090 test_expect_success
'R: --import-marks-if-exists' '
2092 blob=$(echo hi | git hash-object --stdin) &&
2093 echo ":1 $blob" >expect &&
2094 git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF &&
2101 test_cmp expect io.marks
2104 test_expect_success
'R: feature import-marks-if-exists' '
2108 git fast-import --export-marks=io.marks <<-\EOF &&
2109 feature import-marks-if-exists=not_io.marks
2111 test_cmp expect io.marks &&
2113 blob=$(echo hi | git hash-object --stdin) &&
2115 echo ":1 $blob" >io.marks &&
2116 echo ":1 $blob" >expect &&
2117 echo ":2 $blob" >>expect &&
2119 git fast-import --export-marks=io.marks <<-\EOF &&
2120 feature import-marks-if-exists=io.marks
2127 test_cmp expect io.marks &&
2129 echo ":3 $blob" >>expect &&
2131 git fast-import --import-marks=io.marks \
2132 --export-marks=io.marks <<-\EOF &&
2133 feature import-marks-if-exists=not_io.marks
2140 test_cmp expect io.marks &&
2144 git fast-import --import-marks-if-exists=not_io.marks \
2145 --export-marks=io.marks <<-\EOF
2146 feature import-marks-if-exists=io.marks
2148 test_cmp expect io.marks
2152 feature import-marks=marks.out
2153 feature export-marks=marks.new
2156 test_expect_success \
2157 'R: import to output marks works without any content' \
2158 'cat input | git fast-import &&
2159 test_cmp marks.out marks.new'
2162 feature import-marks=nonexistent.marks
2163 feature export-marks=marks.new
2166 test_expect_success \
2167 'R: import marks prefers commandline marks file over the stream' \
2168 'cat input | git fast-import --import-marks=marks.out &&
2169 test_cmp marks.out marks.new'
2173 feature import-marks=nonexistent.marks
2174 feature export-marks=combined.marks
2177 test_expect_success
'R: multiple --import-marks= should be honoured' '
2178 head -n2 marks.out > one.marks &&
2179 tail -n +3 marks.out > two.marks &&
2180 git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
2181 test_cmp marks.out combined.marks
2185 feature relative-marks
2186 feature import-marks=relative.in
2187 feature export-marks=relative.out
2190 test_expect_success
'R: feature relative-marks should be honoured' '
2191 mkdir -p .git/info/fast-import/ &&
2192 cp marks.new .git/info/fast-import/relative.in &&
2193 git fast-import <input &&
2194 test_cmp marks.new .git/info/fast-import/relative.out
2198 feature relative-marks
2199 feature import-marks=relative.in
2200 feature no-relative-marks
2201 feature export-marks=non-relative.out
2204 test_expect_success
'R: feature no-relative-marks should be honoured' '
2205 git fast-import <input &&
2206 test_cmp marks.new non-relative.out
2209 test_expect_success
'R: feature ls supported' '
2214 test_expect_success
'R: feature cat-blob supported' '
2215 echo "feature cat-blob" |
2219 test_expect_success
'R: cat-blob-fd must be a nonnegative integer' '
2220 test_must_fail git fast-import --cat-blob-fd=-1 </dev/null
2223 test_expect_success
'R: print old blob' '
2224 blob=$(echo "yes it can" | git hash-object -w --stdin) &&
2225 cat >expect <<-EOF &&
2230 echo "cat-blob $blob" |
2231 git fast-import --cat-blob-fd=6 6>actual &&
2232 test_cmp expect actual
2235 test_expect_success
'R: in-stream cat-blob-fd not respected' '
2236 echo hello >greeting &&
2237 blob=$(git hash-object -w greeting) &&
2238 cat >expect <<-EOF &&
2243 git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF &&
2246 test_cmp expect actual.3 &&
2247 test_cmp empty actual.1 &&
2248 git fast-import 3>actual.3 >actual.1 <<-EOF &&
2249 option cat-blob-fd=3
2252 test_cmp empty actual.3 &&
2253 test_cmp expect actual.1
2256 test_expect_success
'R: print new blob' '
2257 blob=$(echo "yep yep yep" | git hash-object --stdin) &&
2258 cat >expect <<-EOF &&
2263 git fast-import --cat-blob-fd=6 6>actual <<-\EOF &&
2271 test_cmp expect actual
2274 test_expect_success
'R: print new blob by sha1' '
2275 blob=$(echo "a new blob named by sha1" | git hash-object --stdin) &&
2276 cat >expect <<-EOF &&
2278 a new blob named by sha1
2281 git fast-import --cat-blob-fd=6 6>actual <<-EOF &&
2284 a new blob named by sha1
2288 test_cmp expect actual
2291 test_expect_success
'setup: big file' '
2293 echo "the quick brown fox jumps over the lazy dog" >big &&
2296 cat big big big big >bigger &&
2297 cat bigger bigger bigger bigger >big ||
2303 test_expect_success
'R: print two blobs to stdout' '
2304 blob1=$(git hash-object big) &&
2305 blob1_len=$(wc -c <big) &&
2306 blob2=$(echo hello | git hash-object --stdin) &&
2308 echo ${blob1} blob $blob1_len &&
2318 cat <<-\END_PART1 &&
2335 git fast-import >actual &&
2336 test_cmp expect actual
2339 test_expect_success PIPE
'R: copy using cat-file' '
2340 expect_id=$(git hash-object big) &&
2341 expect_len=$(wc -c <big) &&
2342 echo $expect_id blob $expect_len >expect.response &&
2345 cat >frontend <<-\FRONTEND_END &&
2351 export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE &&
2364 read blob_id type size <&3 &&
2365 echo "$blob_id $type $size" >response &&
2366 head_c $size >blob <&3 &&
2370 commit refs/heads/copied
2371 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2373 copy big file as file3
2381 git fast-import --cat-blob-fd=3 3>blobs &&
2382 git show copied:file3 >actual &&
2383 test_cmp expect.response response &&
2387 test_expect_success PIPE
'R: print blob mid-commit' '
2389 echo "A blob from _before_ the commit." >expect &&
2398 A blob from _before_ the commit.
2400 commit refs/heads/temporary
2401 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2408 read blob_id type size <&3 &&
2409 head_c $size >actual <&3 &&
2414 git fast-import --cat-blob-fd=3 3>blobs &&
2415 test_cmp expect actual
2418 test_expect_success PIPE
'R: print staged blob within commit' '
2420 echo "A blob from _within_ the commit." >expect &&
2426 commit refs/heads/within
2427 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2433 A blob from _within_ the commit.
2438 echo "A blob from _within_ the commit." |
2439 git hash-object --stdin
2441 echo "cat-blob $to_get" &&
2443 read blob_id type size <&3 &&
2444 head_c $size >actual <&3 &&
2449 git fast-import --cat-blob-fd=3 3>blobs &&
2450 test_cmp expect actual
2461 test_expect_success
'R: quiet option results in no stats being output' '
2462 cat input | git fast-import 2> output &&
2463 test_cmp empty output
2466 test_expect_success
'R: feature done means terminating "done" is mandatory' '
2467 echo feature done | test_must_fail git fast-import &&
2468 test_must_fail git fast-import --done </dev/null
2471 test_expect_success
'R: terminating "done" with trailing gibberish is ok' '
2472 git fast-import <<-\EOF &&
2477 git fast-import <<-\EOF
2479 more trailing gibberish
2483 test_expect_success
'R: terminating "done" within commit' '
2484 cat >expect <<-\EOF &&
2486 :000000 100644 OBJID OBJID A hello.c
2487 :000000 100644 OBJID OBJID A hello2.c
2489 git fast-import <<-EOF &&
2490 commit refs/heads/done-ends
2491 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2493 Commit terminated by "done" command
2495 M 100644 inline hello.c
2502 git rev-list done-ends |
2503 git diff-tree -r --stdin --root --always |
2504 sed -e "s/$_x40/OBJID/g" >actual &&
2505 test_cmp expect actual
2509 option git non-existing-option
2512 test_expect_success
'R: die on unknown option' '
2513 test_must_fail git fast-import <input
2516 test_expect_success
'R: unknown commandline options are rejected' '\
2517 test_must_fail git fast-import --non-existing-option < /dev/null
2520 test_expect_success
'R: die on invalid option argument' '
2521 echo "option git active-branches=-5" |
2522 test_must_fail git fast-import &&
2523 echo "option git depth=" |
2524 test_must_fail git fast-import &&
2525 test_must_fail git fast-import --depth="5 elephants" </dev/null
2529 option non-existing-vcs non-existing-option
2532 test_expect_success
'R: ignore non-git options' '
2533 git fast-import <input
2537 ## R: very large blobs
2539 blobsize
=$
((2*1024*1024 + 53))
2540 test-genrandom bar
$blobsize >expect
2541 cat >input
<<INPUT_END
2542 commit refs/heads/big-file
2543 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
2552 cat >>input
<<INPUT_END
2559 test_expect_success \
2560 'R: blob bigger than threshold' \
2561 'test_create_repo R &&
2562 git --git-dir=R/.git fast-import --big-file-threshold=1 <input'
2563 test_expect_success \
2564 'R: verify created pack' \
2566 for p in R/.git/objects/pack/*.pack;
2568 git verify-pack -v $p >>verify || exit;
2570 test_expect_success \
2571 'R: verify written objects' \
2572 'git --git-dir=R/.git cat-file blob big-file:big1 >actual &&
2573 test_cmp expect actual &&
2574 a=$(git --git-dir=R/.git rev-parse big-file:big1) &&
2575 b=$(git --git-dir=R/.git rev-parse big-file:big2) &&
2577 test_expect_success \
2578 'R: blob appears only once' \
2579 'n=$(grep $a verify | wc -l) &&