From: Karthik Nayak Date: Tue, 10 Nov 2026 11:50:04 GMT Subject: [PATCH 19/20] t9300: move self-contained tests into dedicated files Message-ID: <20261110-kn-fast-import-tests-1-v1-19-dbd9ee502aae@gmail.com> In-Reply-To: <20261110-kn-fast-import-tests-1-v1-0-dbd9ee502aae@gmail.com> The previous commits worked on making most of the tests within t9300 independent from each other. Now we can move them, as they are, to other files based on what they exercise. Create some new test files: - t9307-fast-import-validation - t9308-fast-import-stream - t9309-fast-import-checkpoint - t9310-fast-import-submodule - t9311-fast-import-refs and move the others to existing test files: - t9301-fast-import-notes - t9304-fast-import-marks Register the new test files in t/meson.build. The series 'A', 'C', 'D', 'H', 'L', 'M', 'N' and 'U' stay in t9300, as they still depend on each other. The tests are moved without changes, which can be checked with 'git show --color-moved'. Signed-off-by: Karthik Nayak --- t/meson.build | 5 + t/t9300-fast-import.sh | 3565 ------------------------------------- t/t9301-fast-import-notes.sh | 411 +++++ t/t9304-fast-import-marks.sh | 393 ++++ t/t9307-fast-import-validation.sh | 1193 +++++++++++++ t/t9308-fast-import-stream.sh | 822 +++++++++ t/t9309-fast-import-checkpoint.sh | 188 ++ t/t9310-fast-import-submodule.sh | 341 ++++ t/t9311-fast-import-refs.sh | 194 ++ 9 files changed, 3547 insertions(+), 3565 deletions(-) diff --git a/t/meson.build b/t/meson.build index 11b3752f00..caf0a76c2d 100644 --- a/t/meson.build +++ b/t/meson.build @@ -1084,6 +1084,11 @@ integration_tests = [ 't9304-fast-import-marks.sh', 't9305-fast-import-signatures.sh', 't9306-fast-import-signed-tags.sh', + 't9307-fast-import-validation.sh', + 't9308-fast-import-stream.sh', + 't9309-fast-import-checkpoint.sh', + 't9310-fast-import-submodule.sh', + 't9311-fast-import-refs.sh', 't9350-fast-export.sh', 't9351-fast-export-anonymize.sh', 't9400-git-cvsserver-server.sh', diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 09cd2c5bf3..48c2913b87 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -37,26 +37,6 @@ echo "$@"' ### series A ### -test_expect_success 'empty stream succeeds' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - git fast-import input.blob && - >marks.exp && - >tree.exp && - - cat >input.commit <<-EOF && - commit refs/heads/verify--dump-marks - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <>input.blob <<-EOF && - blob - mark :$l - data 0 - blob - mark :$m - data 0 - blob - mark :$n - data 0 - EOF - echo "M 100644 :$l l$i" >>input.commit && - echo "M 100644 :$m m$i" >>input.commit && - echo "M 100644 :$n n$i" >>input.commit && - - echo ":$l $mt" >>marks.exp && - echo ":$m $mt" >>marks.exp && - echo ":$n $mt" >>marks.exp && - - printf "100644 blob $mt\tl$i\n" >>tree.exp && - printf "100644 blob $mt\tm$i\n" >>tree.exp && - printf "100644 blob $mt\tn$i\n" >>tree.exp && - - l=$(($l + $l)) && - m=$(($m + $m)) && - n=$(($l + $n)) && - - i=$((1 + $i)) || return 1 - done && - - sort tree.exp > tree.exp_s && - - cat input.blob input.commit | git fast-import --export-marks=marks.large && - git ls-tree refs/heads/verify--dump-marks >tree.out && - test_cmp tree.exp_s tree.out && - test_cmp marks.exp marks.large - ) -' - -### -### series B -### - -test_expect_success 'B: fail on invalid blob sha1' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - test_commit base && - - test_tick && - cat >input <<-INPUT_END && - commit refs/heads/branch - mark :1 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit TEMP_TAG - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/empty-committer-1 - committer <> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/invalid-timezone - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 - data <input <<-INPUT_END && - commit refs/heads/invalid-timezone - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 - data <out && - test_grep "1234567890 [+]051800" out - ) -' - -test_expect_success 'B: accept and fixup committer with no name' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - cat >input <<-INPUT_END && - commit refs/heads/empty-committer-2 - committer $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/invalid-committer - committer Name email> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/invalid-committer - committer Name $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/invalid-committer - committer Name > $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/invalid-committer - committer Name input <<-INPUT_END && - commit refs/heads/invalid-committer - committer Name $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/main - author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500 - data <input <<-INPUT_END && - commit refs/heads/main - author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500 - data <expect <<-EOF && - author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500 - - RFC 2822 type date - EOF - git cat-file commit main | sed 1,2d >actual && - test_cmp expect actual && - - for p in .git/objects/pack/*.pack - do - git verify-pack "$p" || return 1 - done - ) -' - -### -### series F -### - -setup_two_commit_repo () { - test_when_finished "rm -rf repo" && - git init repo && - test_commit -C repo one && - test_commit -C repo two -} - -test_expect_success 'F: non-fast-forward update skips' ' - setup_two_commit_repo && - ( - cd repo && - old_branch=$(git rev-parse --verify main^0) && - test_tick && - cat >input <<-INPUT_END && - commit refs/heads/main - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <expect <<-EOF && - tree $(git rev-parse main~1^{tree}) - parent $(git rev-parse main~1) - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - losing things already? - EOF - git cat-file commit other >actual && - test_cmp expect actual - ) -' - -### -### series G -### - -test_expect_success 'G: non-fast-forward update forced' ' - setup_two_commit_repo && - ( - cd repo && - old_branch=$(git rev-parse --verify main^0) && - test_tick && - cat >input <<-INPUT_END && - commit refs/heads/main - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - commit refs/heads/export-boundary - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <expect <<-EOF && - .git/objects/pack/pack-.pack: $(git rev-parse --verify export-boundary) - EOF - sed -e s/pack-.*pack/pack-.pack/ edges.list >actual && - test_cmp expect actual - ) -' - -### -### series J -### - -test_expect_success 'J: reset existing branch creates empty commit' ' - setup_two_commit_repo && - ( - cd repo && - cat >input <<-INPUT_END && - commit refs/heads/J - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - reset refs/heads/J2 - - tag wrong_tag - from refs/heads/J2 - data <input <<-INPUT_END && - commit refs/heads/K - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <repo/file2/file4 && - git -C repo add file2/file4 && - test_tick && - git -C repo commit -m base -} - -import_reference_commit () { - git fast-import <<-INPUT_END - commit refs/heads/$1 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - #we will - commit refs/heads/O1 - # -- ignore all of this text - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <expect <<-EOF && - 100644 blob $blob4 file2/file4 - 100644 blob $blob4 file3/file4 - 100644 blob $blob5 file3/file5 - EOF - git ls-tree -r O1 >actual && - test_cmp expect actual && - - import_reference_commit O1-reference && - test_cmp_rev O1-reference O1 - ) -' - -test_expect_success 'O: blank lines not necessary after data commands' ' - setup_import_repo && - ( - cd repo && - - cat >input <<-INPUT_END && - commit refs/heads/O2 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <expect <<-EOF && - 100644 blob $blob4 file2/file4 - 100644 blob $blob4 file3/file4 - 100644 blob $blob5 file3/file5 - EOF - git ls-tree -r O2 >actual && - test_cmp expect actual && - - import_reference_commit O2-reference && - test_cmp_rev O2-reference O2 - ) -' - -test_expect_success 'O: blank lines not necessary after other commands' ' - setup_import_repo && - ( - cd repo && - git repack -a -d && - - cat >input <<-INPUT_END && - commit refs/heads/O3 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <expect <<-INPUT_END && - string - of - empty - commits - INPUT_END - - git fast-import packlist && - ls -la .git/objects/pack/pack-*.pack >idxlist && - test_line_count = 4 idxlist && - test_line_count = 4 packlist && - test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) && - git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual && - test_cmp expect actual - ) -' - -test_expect_success 'O: progress outputs as requested by input' ' - setup_import_repo && - ( - cd repo && - - cat >input <<-INPUT_END && - commit refs/heads/O4 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <actual && - grep "progress " expect && - test_cmp expect actual - ) -' - -### -### series P (gitlinks) -### - -setup_gitlinks_repo () { - test_when_finished "rm -rf repo" && - git init repo && - test_commit -C repo base && - ( - cd repo && - - cat >input <<-INPUT_END && - blob - mark :1 - data 10 - test file - - reset refs/heads/sub - commit refs/heads/sub - mark :2 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 12 - sub_initial - M 100644 :1 file - - blob - mark :3 - data < $GIT_COMMITTER_DATE - data 8 - initial - from refs/heads/main - M 100644 :3 .gitmodules - M 160000 :2 sub - - blob - mark :5 - data 20 - test file - more data - - commit refs/heads/sub - mark :6 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 11 - sub_second - from :2 - M 100644 :5 file - - commit refs/heads/subuse1 - mark :7 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 7 - second - from :4 - M 160000 :6 sub - - INPUT_END - - git fast-import input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data 8 - initial - from refs/heads/main - M 100644 :1 .gitmodules - M 160000 $SUBPREV sub - - commit refs/heads/subuse2 - mark :3 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 7 - second - from :2 - M 160000 $SUBLAST sub - - INPUT_END - - git branch -D sub && - git gc --prune=now && - git fast-import input <<-INPUT_END && - commit refs/heads/subuse3 - mark :1 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data <repo/input <<-INPUT_END && - blob - mark :2 - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <expect <<-EOF && - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - first (:3) - EOF - git cat-file commit notes-test~2 | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify second commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - parent $commit1 - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - second (:5) - EOF - git cat-file commit notes-test^ | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify third commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - parent $commit2 - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - third (:6) - EOF - git cat-file commit notes-test | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first notes commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - notes (:9) - EOF - git cat-file commit refs/notes/foobar~2 | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first notes tree' ' - setup_notes_repo && - ( - cd repo && - sort >expect <<-EOF && - 100644 blob $commit1 - 100644 blob $commit2 - 100644 blob $commit3 - EOF - git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first note for first commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note1_data" >expect && - git cat-file blob refs/notes/foobar~2:$commit1 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first note for second commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note2_data" >expect && - git cat-file blob refs/notes/foobar~2:$commit2 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first note for third commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note3_data" >expect && - git cat-file blob refs/notes/foobar~2:$commit3 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify second notes commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - parent $(git rev-parse --verify refs/notes/foobar~2) - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - notes (:10) - EOF - git cat-file commit refs/notes/foobar^ | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify second notes tree' ' - setup_notes_repo && - ( - cd repo && - sort >expect <<-EOF && - 100644 blob $commit1 - 100644 blob $commit2 - 100644 blob $commit3 - EOF - git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify second note for first commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note1b_data" >expect && - git cat-file blob refs/notes/foobar^:$commit1 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first note for second commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note2_data" >expect && - git cat-file blob refs/notes/foobar^:$commit2 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify first note for third commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note3_data" >expect && - git cat-file blob refs/notes/foobar^:$commit3 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify third notes commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - notes (:11) - EOF - git cat-file commit refs/notes/foobar2 | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify third notes tree' ' - setup_notes_repo && - ( - cd repo && - sort >expect <<-EOF && - 100644 blob $commit1 - EOF - git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify third note for first commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note1c_data" >expect && - git cat-file blob refs/notes/foobar2:$commit1 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify fourth notes commit' ' - setup_notes_repo && - ( - cd repo && - cat >expect <<-EOF && - parent $(git rev-parse --verify refs/notes/foobar^) - author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - - notes (:12) - EOF - git cat-file commit refs/notes/foobar | sed 1d >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify fourth notes tree' ' - setup_notes_repo && - ( - cd repo && - sort >expect <<-EOF && - 100644 blob $commit2 - EOF - git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: verify second note for second commit' ' - setup_notes_repo && - ( - cd repo && - echo "$note2b_data" >expect && - git cat-file blob refs/notes/foobar:$commit2 >actual && - test_cmp expect actual - ) -' - -test_expect_success 'Q: deny note on empty branch' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - cat >input <<-EOF && - reset refs/heads/Q0 - - commit refs/heads/note-Q0 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-EOF && - feature no-such-feature-exists - EOF - - test_must_fail git fast-import input <<-EOF && - feature date-format=now - EOF - - git fast-import input <<-EOF && - blob - data 3 - hi - feature date-format=now - EOF - - test_must_fail git fast-import git.marks && - echo "feature import-marks=git.marks" >input && - test_must_fail git fast-import input && - test_must_fail git fast-import git.marks && - >git2.marks && - cat >input <<-EOF && - feature import-marks=git.marks - feature import-marks=git2.marks - EOF - - test_must_fail git fast-import --allow-unsafe-features input && - test_must_fail git fast-import input <<-EOF && - feature export-marks=git.marks - blob - mark :1 - data 3 - hi - - EOF - - git fast-import --allow-unsafe-features input <<-\EOF && - feature export-marks=feature-sub/git.marks - blob - mark :1 - data 3 - hi - - EOF - git fast-import --allow-unsafe-features \ - --export-marks=cmdline-sub/other.marks expect <<-EOF && - :1 $blob - :2 $blob - EOF - git fast-import --export-marks=io.marks <<-\EOF && - blob - mark :1 - data 3 - hi - - EOF - git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF && - blob - mark :2 - data 3 - hi - - EOF - test_cmp expect io.marks - ) -' - -test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - rm -f io.marks && - test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF - blob - mark :1 - data 3 - hi - - EOF - ) -' - -test_expect_success 'R: --import-marks-if-exists' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - rm -f io.marks && - blob=$(echo hi | git hash-object --stdin) && - echo ":1 $blob" >expect && - git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF && - blob - mark :1 - data 3 - hi - - EOF - test_cmp expect io.marks - ) -' - -test_expect_success 'R: feature import-marks-if-exists' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - rm -f io.marks && - - git fast-import --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && - feature import-marks-if-exists=not_io.marks - EOF - test_must_be_empty io.marks && - - blob=$(echo hi | git hash-object -w --stdin) && - - echo ":1 $blob" >io.marks && - echo ":1 $blob" >expect && - echo ":2 $blob" >>expect && - - git fast-import --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && - feature import-marks-if-exists=io.marks - blob - mark :2 - data 3 - hi - - EOF - test_cmp expect io.marks && - - echo ":3 $blob" >>expect && - - git fast-import --import-marks=io.marks \ - --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && - feature import-marks-if-exists=not_io.marks - blob - mark :3 - data 3 - hi - - EOF - test_cmp expect io.marks && - - git fast-import --import-marks-if-exists=not_io.marks \ - --export-marks=io.marks \ - --allow-unsafe-features <<-\EOF && - feature import-marks-if-exists=io.marks - EOF - test_must_be_empty io.marks - ) -' - -create_marks_file () { - git fast-import --export-marks="$1" <<-EOF - blob - mark :1 - data 4 - one - - blob - mark :2 - data 4 - two - - blob - mark :3 - data 6 - three - - blob - mark :4 - data 5 - four - - commit refs/heads/marks - mark :5 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <input <<-EOF && - feature import-marks=marks.out - feature export-marks=marks.new - EOF - - git fast-import --allow-unsafe-features input <<-EOF && - feature import-marks=nonexistent.marks - feature export-marks=marks.new - EOF - - git fast-import --import-marks=marks.out --allow-unsafe-features input <<-EOF && - feature import-marks=nonexistent.marks - feature export-marks=combined.marks - EOF - - head -n2 marks.out >one.marks && - tail -n +3 marks.out >two.marks && - git fast-import --import-marks=one.marks --import-marks=two.marks \ - --allow-unsafe-features input <<-EOF && - feature relative-marks - feature import-marks=relative.in - feature export-marks=relative.out - EOF - - mkdir -p .git/info/fast-import/ && - cp marks.out .git/info/fast-import/relative.in && - git fast-import --allow-unsafe-features input <<-EOF && - feature relative-marks - feature import-marks=relative.in - feature no-relative-marks - feature export-marks=non-relative.out - EOF - - mkdir -p .git/info/fast-import/ && - cp marks.out .git/info/fast-import/relative.in && - git fast-import --allow-unsafe-features expect <<-EOF && - ${blob} blob 11 - yes it can - - EOF - echo "cat-blob $blob" | - git fast-import --cat-blob-fd=6 6>actual && - test_cmp expect actual - ) -' - -test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - echo hello >greeting && - blob=$(git hash-object -w greeting) && - cat >expect <<-EOF && - ${blob} blob 6 - hello - - EOF - git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF && - cat-blob $blob - EOF - test_cmp expect actual.3 && - test_must_be_empty actual.1 && - git fast-import 3>actual.3 >actual.1 <<-EOF && - option cat-blob-fd=3 - cat-blob $blob - EOF - test_must_be_empty actual.3 && - test_cmp expect actual.1 - ) -' - -test_expect_success !MINGW 'R: print mark for new blob' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - echo "effluentish" | git hash-object --stdin >expect && - git fast-import --cat-blob-fd=6 6>actual <<-\EOF && - blob - mark :1 - data <expect <<-EOF && - ${blob} blob 12 - yep yep yep - - EOF - git fast-import --cat-blob-fd=6 6>actual <<-\EOF && - blob - mark :1 - data <expect <<-EOF && - ${blob} blob 25 - a new blob named by sha1 - - EOF - git fast-import --cat-blob-fd=6 6>actual <<-EOF && - blob - data <big && - for i in 1 2 3 - do - cat big big big big >bigger && - cat bigger bigger bigger bigger >big || - exit - done - ) -} - -test_expect_success 'R: print two blobs to stdout' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - setup_big_file && - blob1=$(git hash-object big) && - blob1_len=$(wc -c expect && - { - cat <<-\END_PART1 && - blob - mark :1 - data <actual && - test_cmp expect actual - ) -' - -test_expect_success PIPE 'R: copy using cat-file' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - setup_big_file && - expect_id=$(git hash-object big) && - expect_len=$(wc -c expect.response && - - rm -f blobs && - - mkfifo blobs && - ( - export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE && - cat <<-\EOF && - feature cat-blob - blob - mark :1 - data <response && - test_copy_bytes $size >blob <&3 && - read newline <&3 && - - cat <<-EOF && - commit refs/heads/copied - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <blobs && - git show copied:file3 >actual && - test_cmp expect.response response && - test_cmp big actual - ) -' - -test_expect_success PIPE 'R: print blob mid-commit' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - rm -f blobs && - echo "A blob from _before_ the commit." >expect && - mkfifo blobs && - ( - exec 3 $GIT_COMMITTER_DATE - data <actual <&3 && - read newline <&3 && - - echo - ) | - git fast-import --cat-blob-fd=3 3>blobs && - test_cmp expect actual - ) -' - -test_expect_success PIPE 'R: print staged blob within commit' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - rm -f blobs && - echo "A blob from _within_ the commit." >expect && - mkfifo blobs && - ( - exec 3 $GIT_COMMITTER_DATE - data <actual <&3 && - read newline <&3 && - - echo deleteall - ) | - git fast-import --cat-blob-fd=3 3>blobs && - test_cmp expect actual - ) -' - -test_expect_success 'R: quiet option results in no stats being output' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - cat >input <<-EOF && - option git quiet - blob - data 3 - hi - - EOF - - git fast-import 2>output expect <<-\EOF && - OBJID - :000000 100644 OBJID OBJID A hello.c - :000000 100644 OBJID OBJID A hello2.c - EOF - git fast-import <<-EOF && - commit refs/heads/done-ends - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <actual && - test_cmp expect actual - ) -' - -test_expect_success 'R: die on unknown option' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - cat >input <<-EOF && - option git non-existing-option - EOF - - test_must_fail git fast-import input <<-EOF && - option non-existing-vcs non-existing-option - EOF - - git fast-import expect <<-EOF && - :3 $ZERO_OID - :1 $blob - :2 $blob - EOF - cp expect io.marks && - test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF && - - EOF - test_cmp expect io.marks - ) -' - -## -## R: very large blobs -## -test_expect_success 'R: blob bigger than threshold' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - blobsize=$((2*1024*1024 + 53)) && - test-tool genrandom bar $blobsize >expect && - cat >input <<-INPUT_END && - commit refs/heads/big-file - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <>input && - cat >>input <<-INPUT_END && - M 644 inline big2 - data $blobsize - INPUT_END - cat expect >>input && - echo >>input && - - git -c fastimport.unpackLimit=0 fast-import --big-file-threshold=1 verify && - - git cat-file blob big-file:big1 >actual && - test_cmp_bin expect actual && - a=$(git rev-parse big-file:big1) && - b=$(git rev-parse big-file:big2) && - test $a = $b && - n=$(grep $a verify | wc -l) && - test 1 = $n - ) -' - -### -### series S (mark and path parsing) -### -# -# Make sure missing spaces and EOLs after mark references -# cause errors. -# -# Setup: -# -# 1--2--4 -# \ / -# -3- -# -# commit marks: 301, 302, 303, 304 -# blob marks: 403, 404, resp. -# note mark: 202 -# -# The error message when a space is missing not at the -# end of the line is: -# -# missing space after .. -# -# or when extra characters come after the mark at the end -# of the line: -# -# garbage after .. -# -# or when the dataref is neither "inline " or a known SHA1, -# -# invalid dataref .. -# -setup_marks_repo () { - test_when_finished "rm -rf repo" && - git init repo && - test_tick && - - cat >repo/input <<-INPUT_END && - commit refs/heads/S - mark :301 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/Snotes - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S2 - mark :303 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <err && - commit refs/heads/S - mark :304 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - tag refs/tags/Stag - from :302x - tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <err && - cat-blob :403x - EOF - test_grep "after mark" err - ) -' - -# -# ls markref -# -test_expect_success 'S: ls with garbage after mark must fail' ' - setup_marks_repo && - ( - cd repo && - - test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && - ls :302x hello.c - EOF - test_grep "space after mark" err - ) -' - -test_expect_success 'S: ls with garbage after sha1 must fail' ' - setup_marks_repo && - ( - cd repo && - - sha1=$(grep :302 marks | cut -d\ -f2) && - test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && - ls ${sha1}x hello.c - EOF - test_grep "space after tree-ish" err - ) -' - -# -# Path parsing -# -# There are two sorts of ways a path can be parsed, depending on whether it is -# the last field on the line. Additionally, ls without a has a special -# case. Test every occurrence of in the grammar against every error case. -# Paths for the root (empty strings) are tested elsewhere. -# - -# -# Valid paths at the end of a line: filemodify, filedelete, filecopy (dest), -# filerename (dest), and ls. -# -# commit :301 from root -- modify hello.c (for setup) -# commit :302 from :301 -- modify $path -# commit :303 from :302 -- delete $path -# commit :304 from :301 -- copy hello.c $path -# commit :305 from :301 -- rename hello.c $path -# ls :305 $path -# -test_path_eol_success () { - local test="$1" path="$2" unquoted_path="$3" - test_expect_success "S: paths at EOL with $test must work" ' - test_when_finished "git branch -D S-path-eol" && - - git -c core.protectNTFS=false fast-import --export-marks=marks.out <<-EOF >out 2>err && - blob - mark :401 - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <tree_m.exp && - git ls-tree $commit_m | sort >tree_m.out && - test_cmp tree_m.exp tree_m.out && - - printf "100644 blob $blob1\thello.c\n" >tree_d.exp && - git ls-tree $commit_d >tree_d.out && - test_cmp tree_d.exp tree_d.out && - - ( - printf "100644 blob $blob1\t$unquoted_path\n" && - printf "100644 blob $blob1\thello.c\n" - ) | sort >tree_c.exp && - git ls-tree $commit_c | sort >tree_c.out && - test_cmp tree_c.exp tree_c.out && - - printf "100644 blob $blob1\t$unquoted_path\n" >tree_r.exp && - git ls-tree $commit_r >tree_r.out && - test_cmp tree_r.exp tree_r.out && - - test_cmp out tree_r.exp - ' -} - -test_path_eol_success 'quoted spaces' '" hello world.c "' ' hello world.c ' -test_path_eol_success 'unquoted spaces' ' hello world.c ' ' hello world.c ' -test_path_eol_success 'octal escapes' '"\150\151\056\143"' 'hi.c' - -# -# Valid paths before a space: filecopy (source) and filerename (source). -# -# commit :301 from root -- modify $path (for setup) -# commit :302 from :301 -- copy $path hello2.c -# commit :303 from :301 -- rename $path hello2.c -# -test_path_space_success () { - local test="$1" path="$2" unquoted_path="$3" - test_expect_success "S: paths before space with $test must work" ' - test_when_finished "git branch -D S-path-space" && - - git -c core.protectNTFS=false fast-import --export-marks=marks.out <<-EOF 2>err && - blob - mark :401 - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <tree_c.exp && - git ls-tree $commit_c | sort >tree_c.out && - test_cmp tree_c.exp tree_c.out && - - printf "100644 blob $blob\thello2.c\n" >tree_r.exp && - git ls-tree $commit_r >tree_r.out && - test_cmp tree_r.exp tree_r.out - ' -} - -test_path_space_success 'quoted spaces' '" hello world.c "' ' hello world.c ' -test_path_space_success 'no unquoted spaces' 'hello_world.c' 'hello_world.c' -test_path_space_success 'octal escapes' '"\150\151\056\143"' 'hi.c' - -# -# Test a single commit change with an invalid path. Run it with all occurrences -# of in the grammar against all error kinds. -# -test_path_fail () { - local change="$1" what="$2" prefix="$3" path="$4" suffix="$5" err_grep="$6" - test_expect_success "S: $change with $what must fail" ' - test_must_fail git fast-import <<-EOF 2>err && - blob - mark :1 - data < $GIT_COMMITTER_DATE - data < $GIT_COMMITTER_DATE - data <, the must be quoted. -test_path_eol_quoted_fail 'ls (without dataref in commit)' 'ls ' path - -### -### series T (ls) -### - -for root in '""' '' -do - test_expect_success "T: ls root ($root) tree" ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - test_commit one && - - sed -e "s/Z\$//" >expect <<-EOF && - 040000 tree $(git rev-parse HEAD^{tree}) Z - EOF - sha1=$(git rev-parse --verify HEAD) && - git fast-import <<-EOF >actual && - ls $sha1 $root - EOF - test_cmp expect actual - ) - ' -done - -test_expect_success 'T: delete branch' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - test_commit one && - - git branch to-delete && - git fast-import <<-EOF && - reset refs/heads/to-delete - from $ZERO_OID - EOF - test_must_fail git rev-parse --verify refs/heads/to-delete - ) -' - -test_expect_success 'T: empty reset doesnt delete branch' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - test_commit one && - - git branch not-to-delete && - git fast-import <<-EOF && - reset refs/heads/not-to-delete - EOF - git show-ref && - git rev-parse --verify refs/heads/not-to-delete - ) -' - ### ### series U (filedelete) ### @@ -4316,456 +1203,4 @@ do ' done -### -### series V (checkpoint) -### - -# The commands in input_file should not produce any output on the file -# descriptor set with --cat-blob-fd (or stdout if unspecified). -# -# To make sure you're observing the side effects of checkpoint *before* -# fast-import terminates (and thus writes out its state), check that the -# fast-import process is still running using background_import_still_running -# *after* evaluating the test conditions. -background_import_then_checkpoint () { - options=$1 - input_file=$2 - - mkfifo V.input - exec 8<>V.input - rm V.input - - mkfifo V.output - exec 9<>V.output - rm V.output - - ( - git -C repo fast-import $options <&8 >&9 & - echo $! >&9 - wait $! - echo >&2 "background fast-import terminated too early with exit code $?" - # Un-block the read loop in the main shell process. - echo >&9 UNEXPECTED - ) & - sh_pid=$! - read fi_pid <&9 - # We don't mind if fast-import has already died by the time the test - # ends. - test_when_finished " - exec 8>&-; exec 9>&-; - kill $sh_pid && wait $sh_pid - kill $fi_pid && wait $fi_pid - true" - - # Start in the background to ensure we adhere strictly to (blocking) - # pipes writing sequence. We want to assume that the write below could - # block, e.g. if fast-import blocks writing its own output to &9 - # because there is no reader on &9 yet. - ( - cat "$input_file" - echo "checkpoint" - echo "progress checkpoint" - ) >&8 & - - last=$( - while read output <&9 - do - if test "$output" = "progress checkpoint" || test "$output" = "UNEXPECTED" - then - echo "$output" - break - else - # otherwise ignore cruft - echo >&2 "cruft: $output" - fi - done - ) - - test "$last" = "progress checkpoint" -} - -background_import_still_running () { - if ! kill -0 "$fi_pid" - then - echo >&2 "background fast-import terminated too early" - false - fi -} - -setup_checkpoint_repo () { - test_when_finished "rm -rf repo" && - git init repo && - test_tick && - git -C repo fast-import <<-INPUT_END - commit refs/heads/base - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <repo/input <<-INPUT_END && - progress foo - progress bar - - INPUT_END - - background_import_then_checkpoint "" repo/input && - background_import_still_running -' - -test_expect_success PIPE 'V: checkpoint updates refs after reset' ' - setup_checkpoint_repo && - cat >repo/input <<-\INPUT_END && - reset refs/heads/V - from refs/heads/base - - INPUT_END - - background_import_then_checkpoint "" repo/input && - test "$(git -C repo rev-parse --verify V)" = "$(git -C repo rev-parse --verify base)" && - background_import_still_running -' - -test_expect_success PIPE 'V: checkpoint updates refs and marks after commit' ' - setup_checkpoint_repo && - cat >repo/input <<-INPUT_END && - commit refs/heads/V - mark :1 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 0 - from refs/heads/base - - INPUT_END - - background_import_then_checkpoint "--export-marks=marks.actual" repo/input && - ( - cd repo && - echo ":1 $(git rev-parse --verify V)" >marks.expected && - - test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify base)" && - test_cmp marks.expected marks.actual - ) && - background_import_still_running -' - -# Re-create the exact same commit, but on a different branch: no new object is -# created in the database, but the refs and marks still need to be updated. -test_expect_success PIPE 'V: checkpoint updates refs and marks after commit (no new objects)' ' - setup_checkpoint_repo && - git -C repo -c fastimport.unpackLimit=0 fast-import <<-INPUT_END && - commit refs/heads/V - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 0 - from refs/heads/base - - INPUT_END - - cat >repo/input <<-INPUT_END && - commit refs/heads/V2 - mark :2 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 0 - from refs/heads/base - - INPUT_END - - background_import_then_checkpoint "--export-marks=marks.actual" repo/input && - ( - cd repo && - echo ":2 $(git rev-parse --verify V2)" >marks.expected && - - test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" && - test_cmp marks.expected marks.actual - ) && - background_import_still_running -' - -test_expect_success PIPE 'V: checkpoint updates tags after tag' ' - setup_checkpoint_repo && - cat >repo/input <<-INPUT_END && - tag Vtag - from refs/heads/base - tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data 0 - - INPUT_END - - background_import_then_checkpoint "" repo/input && - git -C repo show-ref -d Vtag && - background_import_still_running -' - -### -### series W (get-mark and empty orphan commits) -### - -w_input () { - cat <<-W_INPUT_END - commit refs/heads/W-branch - mark :1 - author Full Name 1000000000 +0100 - committer Full Name 1000000000 +0100 - data 27 - Intentionally empty commit - LFsget-mark :1 - W_INPUT_END -} - -test_expect_success !MINGW 'W: get-mark & empty orphan commit with no newlines' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - w_input | sed -e s/LFs// | tr L "\n" | git fast-import - ) -' - -test_expect_success !MINGW 'W: get-mark & empty orphan commit with one newline' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - w_input | sed -e s/LFs/L/ | tr L "\n" | git fast-import - ) -' - -test_expect_success !MINGW 'W: get-mark & empty orphan commit with ugly second newline' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - # Technically, this should fail as it has too many linefeeds - # according to the grammar in fast-import.txt. But, for whatever - # reason, it works. Since using the correct number of newlines - # does not work with older (pre-2.22) versions of git, allow apps - # that used this second-newline workaround to keep working by - # checking it with this test... - w_input | sed -e s/LFs/LL/ | tr L "\n" | git fast-import - ) -' - -test_expect_success !MINGW 'W: get-mark & empty orphan commit with erroneous third newline' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - # ...but do NOT allow more empty lines than that (see previous test). - w_input | sed -e s/LFs/LLL/ | tr L "\n" | test_must_fail git fast-import - ) -' - -### -### series X (other new features) -### - -test_expect_success ICONV 'X: handling encoding' ' - test_when_finished "rm -rf repo" && - git init repo && - ( - cd repo && - - test_tick && - cat >input <<-INPUT_END && - commit refs/heads/encoding - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - encoding iso-8859-7 - data <>input && - - git fast-import >othername && - git add othername && - git commit -qm more && - - git fast-export --all >tmp && - sed -e s/othername/somename/ tmp >tmp2 && - git fast-import --force msgs && - - test_grep "dropping.*since it would point to itself" msgs && - git show-ref >refs && - test_grep ! refs/replace refs - ) -' - -### -### series Y (submodules and hash algorithms) -### - -cat >Y-sub-input <<\Y_INPUT_END -blob -mark :1 -data 4 -foo - -reset refs/heads/main -commit refs/heads/main -mark :2 -author Full Name 1000000000 +0100 -committer Full Name 1000000000 +0100 -data 24 -Test submodule commit 1 -M 100644 :1 file - -blob -mark :3 -data 8 -foo -bar - -commit refs/heads/main -mark :4 -author Full Name 1000000001 +0100 -committer Full Name 1000000001 +0100 -data 24 -Test submodule commit 2 -from :2 -M 100644 :3 file -Y_INPUT_END - -# Note that the submodule object IDs are intentionally not translated. -cat >Y-main-input <<\Y_INPUT_END -blob -mark :1 -data 4 -foo - -reset refs/heads/main -commit refs/heads/main -mark :2 -author Full Name 2000000000 +0100 -committer Full Name 2000000000 +0100 -data 14 -Test commit 1 -M 100644 :1 file - -blob -mark :3 -data 73 -[submodule "sub1"] - path = sub1 - url = https://void.example.com/main.git - -commit refs/heads/main -mark :4 -author Full Name 2000000001 +0100 -committer Full Name 2000000001 +0100 -data 14 -Test commit 2 -from :2 -M 100644 :3 .gitmodules -M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1 - -blob -mark :5 -data 8 -foo -bar - -commit refs/heads/main -mark :6 -author Full Name 2000000002 +0100 -committer Full Name 2000000002 +0100 -data 14 -Test commit 3 -from :4 -M 100644 :5 file -M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1 -Y_INPUT_END - -cat >Y-marks <<\Y_INPUT_END -:2 0712c5be7cf681388e355ef47525aaf23aee1a6d -:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 -Y_INPUT_END - -test_expect_success 'Y: rewrite submodules' ' - test_when_finished "rm -rf main1" && - test_oid_cache <<-EOF && - Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504 - Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3 - EOF - git init main1 && - ( - cd main1 && - git init sub2 && - git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input && - git fast-import --rewrite-submodules-from=sub:../Y-marks \ - --rewrite-submodules-to=sub:sub2-marks <../Y-main-input && - test "$(git rev-parse main)" = "$(test_oid Ymain)" - ) -' - -test_expect_success 'Y: reference pending tag or commit' ' - test_oid_cache <<-EOF && - pending_commit sha1:85b46dd918355ff17b4109ec738723d42f235a04 - pending_commit sha256:17e650f097a4db6fe069c96935360d3ccc9b35c4018728c5f311a4217c2ced3d - pending_tag sha1:ec6c4db71feb5f66615214dad2324ce030e777a7 - pending_tag sha256:85edc5eac315bc680677b2fc71622bd77476f057eb8dc8ed6a497803a24f1f46 - EOF - - test_when_finished "rm -rf reference-pending" && - git init reference-pending && - ( - cd reference-pending && - git fast-import <<-EOF - commit refs/heads/main - committer A U Thor 1712563200 +0000 - data 14 - commit message - M 644 inline test file - data 14 - dummy content - - tag newtag - from $(test_oid pending_commit) - tagger A U Thor 1712563300 +0000 - data 11 - tag message - # no emty line after tag data! - reset refs/heads/other - from $(test_oid pending_tag) - - commit refs/heads/further - committer A U Thor 1712563400 +0000 - data 21 - what about 2nd commit - from $(test_oid pending_commit) - M 644 inline other test file - data 19 - more dummy content - - done - EOF - ) -' - test_done diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh index e62173cf1f..5d43a523d0 100755 --- a/t/t9301-fast-import-notes.sh +++ b/t/t9301-fast-import-notes.sh @@ -724,4 +724,415 @@ test_expect_success "add notes to $num_commits commits in each of $num_notes_ref ' +setup_notes_repo () { + test_when_finished "rm -rf repo" && + git init repo && + file2_data="file2 +second line of EOF" && + file4_data=abcd && + file4_len=4 && + file5_data="an inline file. + we should see it later." && + file6_data="#!/bin/sh +echo \"\$@\"" && + note1_data="The first note for the first commit" && + note2_data="The first note for the second commit" && + note3_data="The first note for the third commit" && + note1b_data="The second note for the first commit" && + note1c_data="The third note for the first commit" && + note2b_data="The second note for the second commit" && + + test_tick && + cat >repo/input <<-INPUT_END && + blob + mark :2 + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <expect <<-EOF && + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + first (:3) + EOF + git cat-file commit notes-test~2 | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify second commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + parent $commit1 + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + second (:5) + EOF + git cat-file commit notes-test^ | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify third commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + parent $commit2 + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + third (:6) + EOF + git cat-file commit notes-test | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first notes commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + notes (:9) + EOF + git cat-file commit refs/notes/foobar~2 | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first notes tree' ' + setup_notes_repo && + ( + cd repo && + sort >expect <<-EOF && + 100644 blob $commit1 + 100644 blob $commit2 + 100644 blob $commit3 + EOF + git cat-file -p refs/notes/foobar~2^{tree} | sed "s/ [0-9a-f]* / /" >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first note for first commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note1_data" >expect && + git cat-file blob refs/notes/foobar~2:$commit1 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first note for second commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note2_data" >expect && + git cat-file blob refs/notes/foobar~2:$commit2 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first note for third commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note3_data" >expect && + git cat-file blob refs/notes/foobar~2:$commit3 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify second notes commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + parent $(git rev-parse --verify refs/notes/foobar~2) + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + notes (:10) + EOF + git cat-file commit refs/notes/foobar^ | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify second notes tree' ' + setup_notes_repo && + ( + cd repo && + sort >expect <<-EOF && + 100644 blob $commit1 + 100644 blob $commit2 + 100644 blob $commit3 + EOF + git cat-file -p refs/notes/foobar^^{tree} | sed "s/ [0-9a-f]* / /" >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify second note for first commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note1b_data" >expect && + git cat-file blob refs/notes/foobar^:$commit1 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first note for second commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note2_data" >expect && + git cat-file blob refs/notes/foobar^:$commit2 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify first note for third commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note3_data" >expect && + git cat-file blob refs/notes/foobar^:$commit3 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify third notes commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + notes (:11) + EOF + git cat-file commit refs/notes/foobar2 | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify third notes tree' ' + setup_notes_repo && + ( + cd repo && + sort >expect <<-EOF && + 100644 blob $commit1 + EOF + git cat-file -p refs/notes/foobar2^{tree} | sed "s/ [0-9a-f]* / /" >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify third note for first commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note1c_data" >expect && + git cat-file blob refs/notes/foobar2:$commit1 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify fourth notes commit' ' + setup_notes_repo && + ( + cd repo && + cat >expect <<-EOF && + parent $(git rev-parse --verify refs/notes/foobar^) + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + notes (:12) + EOF + git cat-file commit refs/notes/foobar | sed 1d >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify fourth notes tree' ' + setup_notes_repo && + ( + cd repo && + sort >expect <<-EOF && + 100644 blob $commit2 + EOF + git cat-file -p refs/notes/foobar^{tree} | sed "s/ [0-9a-f]* / /" >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: verify second note for second commit' ' + setup_notes_repo && + ( + cd repo && + echo "$note2b_data" >expect && + git cat-file blob refs/notes/foobar:$commit2 >actual && + test_cmp expect actual + ) +' + +test_expect_success 'Q: deny note on empty branch' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + cat >input <<-EOF && + reset refs/heads/Q0 + + commit refs/heads/note-Q0 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-EOF && + feature export-marks=git.marks + blob + mark :1 + data 3 + hi + + EOF + + git fast-import --allow-unsafe-features input <<-\EOF && + feature export-marks=feature-sub/git.marks + blob + mark :1 + data 3 + hi + + EOF + git fast-import --allow-unsafe-features \ + --export-marks=cmdline-sub/other.marks expect <<-EOF && + :1 $blob + :2 $blob + EOF + git fast-import --export-marks=io.marks <<-\EOF && + blob + mark :1 + data 3 + hi + + EOF + git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF && + blob + mark :2 + data 3 + hi + + EOF + test_cmp expect io.marks + ) +' + +test_expect_success 'R: --import-marks=foo --output-marks=foo to create foo fails' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f io.marks && + test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF + blob + mark :1 + data 3 + hi + + EOF + ) +' + +test_expect_success 'R: --import-marks-if-exists' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f io.marks && + blob=$(echo hi | git hash-object --stdin) && + echo ":1 $blob" >expect && + git fast-import --import-marks-if-exists=io.marks --export-marks=io.marks <<-\EOF && + blob + mark :1 + data 3 + hi + + EOF + test_cmp expect io.marks + ) +' + +test_expect_success 'R: feature import-marks-if-exists' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f io.marks && + + git fast-import --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && + feature import-marks-if-exists=not_io.marks + EOF + test_must_be_empty io.marks && + + blob=$(echo hi | git hash-object -w --stdin) && + + echo ":1 $blob" >io.marks && + echo ":1 $blob" >expect && + echo ":2 $blob" >>expect && + + git fast-import --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && + feature import-marks-if-exists=io.marks + blob + mark :2 + data 3 + hi + + EOF + test_cmp expect io.marks && + + echo ":3 $blob" >>expect && + + git fast-import --import-marks=io.marks \ + --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && + feature import-marks-if-exists=not_io.marks + blob + mark :3 + data 3 + hi + + EOF + test_cmp expect io.marks && + + git fast-import --import-marks-if-exists=not_io.marks \ + --export-marks=io.marks \ + --allow-unsafe-features <<-\EOF && + feature import-marks-if-exists=io.marks + EOF + test_must_be_empty io.marks + ) +' + +test_expect_success 'R: corrupt lines do not mess marks file' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f io.marks && + blob=$(echo hi | git hash-object --stdin) && + cat >expect <<-EOF && + :3 $ZERO_OID + :1 $blob + :2 $blob + EOF + cp expect io.marks && + test_must_fail git fast-import --import-marks=io.marks --export-marks=io.marks <<-\EOF && + + EOF + test_cmp expect io.marks + ) +' + +create_marks_file () { + git fast-import --export-marks="$1" <<-EOF + blob + mark :1 + data 4 + one + + blob + mark :2 + data 4 + two + + blob + mark :3 + data 6 + three + + blob + mark :4 + data 5 + four + + commit refs/heads/marks + mark :5 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <input <<-EOF && + feature import-marks=marks.out + feature export-marks=marks.new + EOF + + git fast-import --allow-unsafe-features input <<-EOF && + feature import-marks=nonexistent.marks + feature export-marks=marks.new + EOF + + git fast-import --import-marks=marks.out --allow-unsafe-features input <<-EOF && + feature import-marks=nonexistent.marks + feature export-marks=combined.marks + EOF + + head -n2 marks.out >one.marks && + tail -n +3 marks.out >two.marks && + git fast-import --import-marks=one.marks --import-marks=two.marks \ + --allow-unsafe-features input <<-EOF && + feature relative-marks + feature import-marks=relative.in + feature export-marks=relative.out + EOF + + mkdir -p .git/info/fast-import/ && + cp marks.out .git/info/fast-import/relative.in && + git fast-import --allow-unsafe-features input <<-EOF && + feature relative-marks + feature import-marks=relative.in + feature no-relative-marks + feature export-marks=non-relative.out + EOF + + mkdir -p .git/info/fast-import/ && + cp marks.out .git/info/fast-import/relative.in && + git fast-import --allow-unsafe-features input.blob && + >marks.exp && + >tree.exp && + + cat >input.commit <<-EOF && + commit refs/heads/verify--dump-marks + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <>input.blob <<-EOF && + blob + mark :$l + data 0 + blob + mark :$m + data 0 + blob + mark :$n + data 0 + EOF + echo "M 100644 :$l l$i" >>input.commit && + echo "M 100644 :$m m$i" >>input.commit && + echo "M 100644 :$n n$i" >>input.commit && + + echo ":$l $mt" >>marks.exp && + echo ":$m $mt" >>marks.exp && + echo ":$n $mt" >>marks.exp && + + printf "100644 blob $mt\tl$i\n" >>tree.exp && + printf "100644 blob $mt\tm$i\n" >>tree.exp && + printf "100644 blob $mt\tn$i\n" >>tree.exp && + + l=$(($l + $l)) && + m=$(($m + $m)) && + n=$(($l + $n)) && + + i=$((1 + $i)) || return 1 + done && + + sort tree.exp > tree.exp_s && + + cat input.blob input.commit | git fast-import --export-marks=marks.large && + git ls-tree refs/heads/verify--dump-marks >tree.out && + test_cmp tree.exp_s tree.out && + test_cmp marks.exp marks.large + ) +' + test_done diff --git a/t/t9307-fast-import-validation.sh b/t/t9307-fast-import-validation.sh new file mode 100755 index 0000000000..e52ae3326f --- /dev/null +++ b/t/t9307-fast-import-validation.sh @@ -0,0 +1,1193 @@ +#!/bin/sh + +test_description='git fast-import validation' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success 'B: fail on invalid blob sha1' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit base && + + test_tick && + cat >input <<-INPUT_END && + commit refs/heads/branch + mark :1 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit TEMP_TAG + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/empty-committer-1 + committer <> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <out && + test_grep "1234567890 [+]051800" out + ) +' + +test_expect_success 'B: accept and fixup committer with no name' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + cat >input <<-INPUT_END && + commit refs/heads/empty-committer-2 + committer $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/invalid-committer + committer Name email> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/invalid-committer + committer Name $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/invalid-committer + committer Name > $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/invalid-committer + committer Name input <<-INPUT_END && + commit refs/heads/invalid-committer + committer Name $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data <input <<-EOF && + feature no-such-feature-exists + EOF + + test_must_fail git fast-import input <<-EOF && + feature date-format=now + EOF + + git fast-import input <<-EOF && + blob + data 3 + hi + feature date-format=now + EOF + + test_must_fail git fast-import git.marks && + echo "feature import-marks=git.marks" >input && + test_must_fail git fast-import input && + test_must_fail git fast-import git.marks && + >git2.marks && + cat >input <<-EOF && + feature import-marks=git.marks + feature import-marks=git2.marks + EOF + + test_must_fail git fast-import --allow-unsafe-features input && + test_must_fail git fast-import input <<-EOF && + option git non-existing-option + EOF + + test_must_fail git fast-import input <<-EOF && + option non-existing-vcs non-existing-option + EOF + + git fast-import repo/input <<-INPUT_END && + commit refs/heads/S + mark :301 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/Snotes + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S2 + mark :303 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <err && + commit refs/heads/S + mark :304 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + tag refs/tags/Stag + from :302x + tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <err && + cat-blob :403x + EOF + test_grep "after mark" err + ) +' + +# +# ls markref +# +test_expect_success 'S: ls with garbage after mark must fail' ' + setup_marks_repo && + ( + cd repo && + + test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && + ls :302x hello.c + EOF + test_grep "space after mark" err + ) +' + +test_expect_success 'S: ls with garbage after sha1 must fail' ' + setup_marks_repo && + ( + cd repo && + + sha1=$(grep :302 marks | cut -d\ -f2) && + test_must_fail git fast-import --import-marks=marks <<-EOF 2>err && + ls ${sha1}x hello.c + EOF + test_grep "space after tree-ish" err + ) +' + +# +# Path parsing +# +# There are two sorts of ways a path can be parsed, depending on whether it is +# the last field on the line. Additionally, ls without a has a special +# case. Test every occurrence of in the grammar against every error case. +# Paths for the root (empty strings) are tested elsewhere. +# + +# +# Valid paths at the end of a line: filemodify, filedelete, filecopy (dest), +# filerename (dest), and ls. +# +# commit :301 from root -- modify hello.c (for setup) +# commit :302 from :301 -- modify $path +# commit :303 from :302 -- delete $path +# commit :304 from :301 -- copy hello.c $path +# commit :305 from :301 -- rename hello.c $path +# ls :305 $path +# +test_path_eol_success () { + local test="$1" path="$2" unquoted_path="$3" + test_expect_success "S: paths at EOL with $test must work" ' + test_when_finished "git branch -D S-path-eol" && + + git -c core.protectNTFS=false fast-import --export-marks=marks.out <<-EOF >out 2>err && + blob + mark :401 + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <tree_m.exp && + git ls-tree $commit_m | sort >tree_m.out && + test_cmp tree_m.exp tree_m.out && + + printf "100644 blob $blob1\thello.c\n" >tree_d.exp && + git ls-tree $commit_d >tree_d.out && + test_cmp tree_d.exp tree_d.out && + + ( + printf "100644 blob $blob1\t$unquoted_path\n" && + printf "100644 blob $blob1\thello.c\n" + ) | sort >tree_c.exp && + git ls-tree $commit_c | sort >tree_c.out && + test_cmp tree_c.exp tree_c.out && + + printf "100644 blob $blob1\t$unquoted_path\n" >tree_r.exp && + git ls-tree $commit_r >tree_r.out && + test_cmp tree_r.exp tree_r.out && + + test_cmp out tree_r.exp + ' +} + +test_path_eol_success 'quoted spaces' '" hello world.c "' ' hello world.c ' +test_path_eol_success 'unquoted spaces' ' hello world.c ' ' hello world.c ' +test_path_eol_success 'octal escapes' '"\150\151\056\143"' 'hi.c' + +# +# Valid paths before a space: filecopy (source) and filerename (source). +# +# commit :301 from root -- modify $path (for setup) +# commit :302 from :301 -- copy $path hello2.c +# commit :303 from :301 -- rename $path hello2.c +# +test_path_space_success () { + local test="$1" path="$2" unquoted_path="$3" + test_expect_success "S: paths before space with $test must work" ' + test_when_finished "git branch -D S-path-space" && + + git -c core.protectNTFS=false fast-import --export-marks=marks.out <<-EOF 2>err && + blob + mark :401 + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <tree_c.exp && + git ls-tree $commit_c | sort >tree_c.out && + test_cmp tree_c.exp tree_c.out && + + printf "100644 blob $blob\thello2.c\n" >tree_r.exp && + git ls-tree $commit_r >tree_r.out && + test_cmp tree_r.exp tree_r.out + ' +} + +test_path_space_success 'quoted spaces' '" hello world.c "' ' hello world.c ' +test_path_space_success 'no unquoted spaces' 'hello_world.c' 'hello_world.c' +test_path_space_success 'octal escapes' '"\150\151\056\143"' 'hi.c' + +# +# Test a single commit change with an invalid path. Run it with all occurrences +# of in the grammar against all error kinds. +# +test_path_fail () { + local change="$1" what="$2" prefix="$3" path="$4" suffix="$5" err_grep="$6" + test_expect_success "S: $change with $what must fail" ' + test_must_fail git fast-import <<-EOF 2>err && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <, the must be quoted. +test_path_eol_quoted_fail 'ls (without dataref in commit)' 'ls ' path + +test_expect_success 'E: rfc2822 date, --date-format=raw' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit one && + + cat >input <<-INPUT_END && + commit refs/heads/main + author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500 + data <input <<-INPUT_END && + commit refs/heads/main + author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Tue Feb 6 11:22:18 2007 -0500 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> Tue Feb 6 12:35:02 2007 -0500 + data <expect <<-EOF && + author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> 1170778938 -0500 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1170783302 -0500 + + RFC 2822 type date + EOF + git cat-file commit main | sed 1,2d >actual && + test_cmp expect actual && + + for p in .git/objects/pack/*.pack + do + git verify-pack "$p" || return 1 + done + ) +' + +test_done diff --git a/t/t9308-fast-import-stream.sh b/t/t9308-fast-import-stream.sh new file mode 100755 index 0000000000..f8743cbfa4 --- /dev/null +++ b/t/t9308-fast-import-stream.sh @@ -0,0 +1,822 @@ +#!/bin/sh + +test_description='test fast-import stream handling and output' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success 'empty stream succeeds' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + git fast-import expect <<-EOF && + ${blob} blob 11 + yes it can + + EOF + echo "cat-blob $blob" | + git fast-import --cat-blob-fd=6 6>actual && + test_cmp expect actual + ) +' + +test_expect_success !MINGW 'R: in-stream cat-blob-fd not respected' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + echo hello >greeting && + blob=$(git hash-object -w greeting) && + cat >expect <<-EOF && + ${blob} blob 6 + hello + + EOF + git fast-import --cat-blob-fd=3 3>actual.3 >actual.1 <<-EOF && + cat-blob $blob + EOF + test_cmp expect actual.3 && + test_must_be_empty actual.1 && + git fast-import 3>actual.3 >actual.1 <<-EOF && + option cat-blob-fd=3 + cat-blob $blob + EOF + test_must_be_empty actual.3 && + test_cmp expect actual.1 + ) +' + +test_expect_success !MINGW 'R: print mark for new blob' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + echo "effluentish" | git hash-object --stdin >expect && + git fast-import --cat-blob-fd=6 6>actual <<-\EOF && + blob + mark :1 + data <expect <<-EOF && + ${blob} blob 12 + yep yep yep + + EOF + git fast-import --cat-blob-fd=6 6>actual <<-\EOF && + blob + mark :1 + data <expect <<-EOF && + ${blob} blob 25 + a new blob named by sha1 + + EOF + git fast-import --cat-blob-fd=6 6>actual <<-EOF && + blob + data <big && + for i in 1 2 3 + do + cat big big big big >bigger && + cat bigger bigger bigger bigger >big || + exit + done + ) +} + +test_expect_success 'R: print two blobs to stdout' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + setup_big_file && + blob1=$(git hash-object big) && + blob1_len=$(wc -c expect && + { + cat <<-\END_PART1 && + blob + mark :1 + data <actual && + test_cmp expect actual + ) +' + +test_expect_success PIPE 'R: copy using cat-file' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + setup_big_file && + expect_id=$(git hash-object big) && + expect_len=$(wc -c expect.response && + + rm -f blobs && + + mkfifo blobs && + ( + export GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE && + cat <<-\EOF && + feature cat-blob + blob + mark :1 + data <response && + test_copy_bytes $size >blob <&3 && + read newline <&3 && + + cat <<-EOF && + commit refs/heads/copied + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <blobs && + git show copied:file3 >actual && + test_cmp expect.response response && + test_cmp big actual + ) +' + +test_expect_success PIPE 'R: print blob mid-commit' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f blobs && + echo "A blob from _before_ the commit." >expect && + mkfifo blobs && + ( + exec 3 $GIT_COMMITTER_DATE + data <actual <&3 && + read newline <&3 && + + echo + ) | + git fast-import --cat-blob-fd=3 3>blobs && + test_cmp expect actual + ) +' + +test_expect_success PIPE 'R: print staged blob within commit' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + rm -f blobs && + echo "A blob from _within_ the commit." >expect && + mkfifo blobs && + ( + exec 3 $GIT_COMMITTER_DATE + data <actual <&3 && + read newline <&3 && + + echo deleteall + ) | + git fast-import --cat-blob-fd=3 3>blobs && + test_cmp expect actual + ) +' + +test_expect_success 'R: quiet option results in no stats being output' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + cat >input <<-EOF && + option git quiet + blob + data 3 + hi + + EOF + + git fast-import 2>output expect <<-\EOF && + OBJID + :000000 100644 OBJID OBJID A hello.c + :000000 100644 OBJID OBJID A hello2.c + EOF + git fast-import <<-EOF && + commit refs/heads/done-ends + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <actual && + test_cmp expect actual + ) +' + +setup_import_repo () { + test_when_finished "rm -rf repo" && + git init repo && + git -C repo config fastimport.unpackLimit 0 && + mkdir repo/file2 && + echo abcd >repo/file2/file4 && + git -C repo add file2/file4 && + test_tick && + git -C repo commit -m base +} + +import_reference_commit () { + git fast-import <<-INPUT_END + commit refs/heads/$1 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + #we will + commit refs/heads/O1 + # -- ignore all of this text + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <expect <<-EOF && + 100644 blob $blob4 file2/file4 + 100644 blob $blob4 file3/file4 + 100644 blob $blob5 file3/file5 + EOF + git ls-tree -r O1 >actual && + test_cmp expect actual && + + import_reference_commit O1-reference && + test_cmp_rev O1-reference O1 + ) +' + +test_expect_success 'O: blank lines not necessary after data commands' ' + setup_import_repo && + ( + cd repo && + + cat >input <<-INPUT_END && + commit refs/heads/O2 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <expect <<-EOF && + 100644 blob $blob4 file2/file4 + 100644 blob $blob4 file3/file4 + 100644 blob $blob5 file3/file5 + EOF + git ls-tree -r O2 >actual && + test_cmp expect actual && + + import_reference_commit O2-reference && + test_cmp_rev O2-reference O2 + ) +' + +test_expect_success 'O: blank lines not necessary after other commands' ' + setup_import_repo && + ( + cd repo && + git repack -a -d && + + cat >input <<-INPUT_END && + commit refs/heads/O3 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <expect <<-INPUT_END && + string + of + empty + commits + INPUT_END + + git fast-import packlist && + ls -la .git/objects/pack/pack-*.pack >idxlist && + test_line_count = 4 idxlist && + test_line_count = 4 packlist && + test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) && + git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual && + test_cmp expect actual + ) +' + +test_expect_success 'O: progress outputs as requested by input' ' + setup_import_repo && + ( + cd repo && + + cat >input <<-INPUT_END && + commit refs/heads/O4 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <actual && + grep "progress " expect && + test_cmp expect actual + ) +' + +## +## R: very large blobs +## +test_expect_success 'R: blob bigger than threshold' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + blobsize=$((2*1024*1024 + 53)) && + test-tool genrandom bar $blobsize >expect && + cat >input <<-INPUT_END && + commit refs/heads/big-file + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <>input && + cat >>input <<-INPUT_END && + M 644 inline big2 + data $blobsize + INPUT_END + cat expect >>input && + echo >>input && + + git -c fastimport.unpackLimit=0 fast-import --big-file-threshold=1 verify && + + git cat-file blob big-file:big1 >actual && + test_cmp_bin expect actual && + a=$(git rev-parse big-file:big1) && + b=$(git rev-parse big-file:big2) && + test $a = $b && + n=$(grep $a verify | wc -l) && + test 1 = $n + ) +' + +w_input () { + cat <<-W_INPUT_END + commit refs/heads/W-branch + mark :1 + author Full Name 1000000000 +0100 + committer Full Name 1000000000 +0100 + data 27 + Intentionally empty commit + LFsget-mark :1 + W_INPUT_END +} + +test_expect_success !MINGW 'W: get-mark & empty orphan commit with no newlines' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + w_input | sed -e s/LFs// | tr L "\n" | git fast-import + ) +' + +test_expect_success !MINGW 'W: get-mark & empty orphan commit with one newline' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + w_input | sed -e s/LFs/L/ | tr L "\n" | git fast-import + ) +' + +test_expect_success !MINGW 'W: get-mark & empty orphan commit with ugly second newline' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + # Technically, this should fail as it has too many linefeeds + # according to the grammar in fast-import.txt. But, for whatever + # reason, it works. Since using the correct number of newlines + # does not work with older (pre-2.22) versions of git, allow apps + # that used this second-newline workaround to keep working by + # checking it with this test... + w_input | sed -e s/LFs/LL/ | tr L "\n" | git fast-import + ) +' + +test_expect_success !MINGW 'W: get-mark & empty orphan commit with erroneous third newline' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + # ...but do NOT allow more empty lines than that (see previous test). + w_input | sed -e s/LFs/LLL/ | tr L "\n" | test_must_fail git fast-import + ) +' + +test_expect_success ICONV 'X: handling encoding' ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + test_tick && + cat >input <<-INPUT_END && + commit refs/heads/encoding + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + encoding iso-8859-7 + data <>input && + + git fast-import >othername && + git add othername && + git commit -qm more && + + git fast-export --all >tmp && + sed -e s/othername/somename/ tmp >tmp2 && + git fast-import --force msgs && + + test_grep "dropping.*since it would point to itself" msgs && + git show-ref >refs && + test_grep ! refs/replace refs + ) +' + +for root in '""' '' +do + test_expect_success "T: ls root ($root) tree" ' + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + test_commit one && + + sed -e "s/Z\$//" >expect <<-EOF && + 040000 tree $(git rev-parse HEAD^{tree}) Z + EOF + sha1=$(git rev-parse --verify HEAD) && + git fast-import <<-EOF >actual && + ls $sha1 $root + EOF + test_cmp expect actual + ) + ' +done + +test_expect_success 'I: export-pack-edges' ' + test_when_finished "rm -rf repo" && + git init -b main repo && + ( + cd repo && + test_commit one && + + cat >input <<-INPUT_END && + commit refs/heads/export-boundary + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <expect <<-EOF && + .git/objects/pack/pack-.pack: $(git rev-parse --verify export-boundary) + EOF + sed -e s/pack-.*pack/pack-.pack/ edges.list >actual && + test_cmp expect actual + ) +' + +test_done diff --git a/t/t9309-fast-import-checkpoint.sh b/t/t9309-fast-import-checkpoint.sh new file mode 100755 index 0000000000..64674dcf83 --- /dev/null +++ b/t/t9309-fast-import-checkpoint.sh @@ -0,0 +1,188 @@ +#!/bin/sh + +test_description='test fast-import checkpoint handling' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +# The commands in input_file should not produce any output on the file +# descriptor set with --cat-blob-fd (or stdout if unspecified). +# +# To make sure you're observing the side effects of checkpoint *before* +# fast-import terminates (and thus writes out its state), check that the +# fast-import process is still running using background_import_still_running +# *after* evaluating the test conditions. +background_import_then_checkpoint () { + options=$1 + input_file=$2 + + mkfifo V.input + exec 8<>V.input + rm V.input + + mkfifo V.output + exec 9<>V.output + rm V.output + + ( + git -C repo fast-import $options <&8 >&9 & + echo $! >&9 + wait $! + echo >&2 "background fast-import terminated too early with exit code $?" + # Un-block the read loop in the main shell process. + echo >&9 UNEXPECTED + ) & + sh_pid=$! + read fi_pid <&9 + # We don't mind if fast-import has already died by the time the test + # ends. + test_when_finished " + exec 8>&-; exec 9>&-; + kill $sh_pid && wait $sh_pid + kill $fi_pid && wait $fi_pid + true" + + # Start in the background to ensure we adhere strictly to (blocking) + # pipes writing sequence. We want to assume that the write below could + # block, e.g. if fast-import blocks writing its own output to &9 + # because there is no reader on &9 yet. + ( + cat "$input_file" + echo "checkpoint" + echo "progress checkpoint" + ) >&8 & + + last=$( + while read output <&9 + do + if test "$output" = "progress checkpoint" || test "$output" = "UNEXPECTED" + then + echo "$output" + break + else + # otherwise ignore cruft + echo >&2 "cruft: $output" + fi + done + ) + + test "$last" = "progress checkpoint" +} + +background_import_still_running () { + if ! kill -0 "$fi_pid" + then + echo >&2 "background fast-import terminated too early" + false + fi +} + +setup_checkpoint_repo () { + test_when_finished "rm -rf repo" && + git init repo && + test_tick && + git -C repo fast-import <<-INPUT_END + commit refs/heads/base + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <repo/input <<-INPUT_END && + progress foo + progress bar + + INPUT_END + + background_import_then_checkpoint "" repo/input && + background_import_still_running +' + +test_expect_success PIPE 'V: checkpoint updates refs after reset' ' + setup_checkpoint_repo && + cat >repo/input <<-\INPUT_END && + reset refs/heads/V + from refs/heads/base + + INPUT_END + + background_import_then_checkpoint "" repo/input && + test "$(git -C repo rev-parse --verify V)" = "$(git -C repo rev-parse --verify base)" && + background_import_still_running +' + +test_expect_success PIPE 'V: checkpoint updates refs and marks after commit' ' + setup_checkpoint_repo && + cat >repo/input <<-INPUT_END && + commit refs/heads/V + mark :1 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 0 + from refs/heads/base + + INPUT_END + + background_import_then_checkpoint "--export-marks=marks.actual" repo/input && + ( + cd repo && + echo ":1 $(git rev-parse --verify V)" >marks.expected && + + test "$(git rev-parse --verify V^)" = "$(git rev-parse --verify base)" && + test_cmp marks.expected marks.actual + ) && + background_import_still_running +' + +# Re-create the exact same commit, but on a different branch: no new object is +# created in the database, but the refs and marks still need to be updated. +test_expect_success PIPE 'V: checkpoint updates refs and marks after commit (no new objects)' ' + setup_checkpoint_repo && + git -C repo -c fastimport.unpackLimit=0 fast-import <<-INPUT_END && + commit refs/heads/V + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 0 + from refs/heads/base + + INPUT_END + + cat >repo/input <<-INPUT_END && + commit refs/heads/V2 + mark :2 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 0 + from refs/heads/base + + INPUT_END + + background_import_then_checkpoint "--export-marks=marks.actual" repo/input && + ( + cd repo && + echo ":2 $(git rev-parse --verify V2)" >marks.expected && + + test "$(git rev-parse --verify V2)" = "$(git rev-parse --verify V)" && + test_cmp marks.expected marks.actual + ) && + background_import_still_running +' + +test_expect_success PIPE 'V: checkpoint updates tags after tag' ' + setup_checkpoint_repo && + cat >repo/input <<-INPUT_END && + tag Vtag + from refs/heads/base + tagger $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 0 + + INPUT_END + + background_import_then_checkpoint "" repo/input && + git -C repo show-ref -d Vtag && + background_import_still_running +' + +test_done diff --git a/t/t9310-fast-import-submodule.sh b/t/t9310-fast-import-submodule.sh new file mode 100755 index 0000000000..6e7dbda9f9 --- /dev/null +++ b/t/t9310-fast-import-submodule.sh @@ -0,0 +1,341 @@ +#!/bin/sh + +test_description='test fast-import with submodules and gitlinks' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +setup_gitlinks_repo () { + test_when_finished "rm -rf repo" && + git init repo && + test_commit -C repo base && + ( + cd repo && + + cat >input <<-INPUT_END && + blob + mark :1 + data 10 + test file + + reset refs/heads/sub + commit refs/heads/sub + mark :2 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 12 + sub_initial + M 100644 :1 file + + blob + mark :3 + data < $GIT_COMMITTER_DATE + data 8 + initial + from refs/heads/main + M 100644 :3 .gitmodules + M 160000 :2 sub + + blob + mark :5 + data 20 + test file + more data + + commit refs/heads/sub + mark :6 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 11 + sub_second + from :2 + M 100644 :5 file + + commit refs/heads/subuse1 + mark :7 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 7 + second + from :4 + M 160000 :6 sub + + INPUT_END + + git fast-import input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data 8 + initial + from refs/heads/main + M 100644 :1 .gitmodules + M 160000 $SUBPREV sub + + commit refs/heads/subuse2 + mark :3 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data 7 + second + from :2 + M 160000 $SUBLAST sub + + INPUT_END + + git branch -D sub && + git gc --prune=now && + git fast-import input <<-INPUT_END && + commit refs/heads/subuse3 + mark :1 + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + blob + mark :1 + data < $GIT_COMMITTER_DATE + data <Y-sub-input <<\Y_INPUT_END +blob +mark :1 +data 4 +foo + +reset refs/heads/main +commit refs/heads/main +mark :2 +author Full Name 1000000000 +0100 +committer Full Name 1000000000 +0100 +data 24 +Test submodule commit 1 +M 100644 :1 file + +blob +mark :3 +data 8 +foo +bar + +commit refs/heads/main +mark :4 +author Full Name 1000000001 +0100 +committer Full Name 1000000001 +0100 +data 24 +Test submodule commit 2 +from :2 +M 100644 :3 file +Y_INPUT_END + +# Note that the submodule object IDs are intentionally not translated. +cat >Y-main-input <<\Y_INPUT_END +blob +mark :1 +data 4 +foo + +reset refs/heads/main +commit refs/heads/main +mark :2 +author Full Name 2000000000 +0100 +committer Full Name 2000000000 +0100 +data 14 +Test commit 1 +M 100644 :1 file + +blob +mark :3 +data 73 +[submodule "sub1"] + path = sub1 + url = https://void.example.com/main.git + +commit refs/heads/main +mark :4 +author Full Name 2000000001 +0100 +committer Full Name 2000000001 +0100 +data 14 +Test commit 2 +from :2 +M 100644 :3 .gitmodules +M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1 + +blob +mark :5 +data 8 +foo +bar + +commit refs/heads/main +mark :6 +author Full Name 2000000002 +0100 +committer Full Name 2000000002 +0100 +data 14 +Test commit 3 +from :4 +M 100644 :5 file +M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1 +Y_INPUT_END + +cat >Y-marks <<\Y_INPUT_END +:2 0712c5be7cf681388e355ef47525aaf23aee1a6d +:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 +Y_INPUT_END + +test_expect_success 'Y: rewrite submodules' ' + test_when_finished "rm -rf main1" && + test_oid_cache <<-EOF && + Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504 + Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3 + EOF + git init main1 && + ( + cd main1 && + git init sub2 && + git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input && + git fast-import --rewrite-submodules-from=sub:../Y-marks \ + --rewrite-submodules-to=sub:sub2-marks <../Y-main-input && + test "$(git rev-parse main)" = "$(test_oid Ymain)" + ) +' + +test_expect_success 'Y: reference pending tag or commit' ' + test_oid_cache <<-EOF && + pending_commit sha1:85b46dd918355ff17b4109ec738723d42f235a04 + pending_commit sha256:17e650f097a4db6fe069c96935360d3ccc9b35c4018728c5f311a4217c2ced3d + pending_tag sha1:ec6c4db71feb5f66615214dad2324ce030e777a7 + pending_tag sha256:85edc5eac315bc680677b2fc71622bd77476f057eb8dc8ed6a497803a24f1f46 + EOF + + test_when_finished "rm -rf reference-pending" && + git init reference-pending && + ( + cd reference-pending && + git fast-import <<-EOF + commit refs/heads/main + committer A U Thor 1712563200 +0000 + data 14 + commit message + M 644 inline test file + data 14 + dummy content + + tag newtag + from $(test_oid pending_commit) + tagger A U Thor 1712563300 +0000 + data 11 + tag message + # no emty line after tag data! + reset refs/heads/other + from $(test_oid pending_tag) + + commit refs/heads/further + committer A U Thor 1712563400 +0000 + data 21 + what about 2nd commit + from $(test_oid pending_commit) + M 644 inline other test file + data 19 + more dummy content + + done + EOF + ) +' + +test_done diff --git a/t/t9311-fast-import-refs.sh b/t/t9311-fast-import-refs.sh new file mode 100755 index 0000000000..2bb8ac1d46 --- /dev/null +++ b/t/t9311-fast-import-refs.sh @@ -0,0 +1,194 @@ +#!/bin/sh + +test_description='test fast-import ref updates' +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +setup_two_commit_repo () { + test_when_finished "rm -rf repo" && + git init repo && + test_commit -C repo one && + test_commit -C repo two +} + +test_expect_success 'F: non-fast-forward update skips' ' + setup_two_commit_repo && + ( + cd repo && + old_branch=$(git rev-parse --verify main^0) && + test_tick && + cat >input <<-INPUT_END && + commit refs/heads/main + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <expect <<-EOF && + tree $(git rev-parse main~1^{tree}) + parent $(git rev-parse main~1) + author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + + losing things already? + EOF + git cat-file commit other >actual && + test_cmp expect actual + ) +' + +test_expect_success 'G: non-fast-forward update forced' ' + setup_two_commit_repo && + ( + cd repo && + old_branch=$(git rev-parse --verify main^0) && + test_tick && + cat >input <<-INPUT_END && + commit refs/heads/main + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + commit refs/heads/J + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <input <<-INPUT_END && + reset refs/heads/J2 + + tag wrong_tag + from refs/heads/J2 + data <input <<-INPUT_END && + commit refs/heads/K + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE + data < $GIT_COMMITTER_DATE + data <