From: Karthik Nayak Date: Tue, 10 Nov 2026 11:49:47 GMT Subject: [PATCH 02/20] t9300: make the series B tests self-contained Message-ID: <20261110-kn-fast-import-tests-1-v1-2-dbd9ee502aae@gmail.com> In-Reply-To: <20261110-kn-fast-import-tests-1-v1-0-dbd9ee502aae@gmail.com> The 't/t9300-fast-import.sh' test file contains numerous tests and is currently just shy of 4000 lines. This is because the file contains tests over multiple series, each series testing particular functionality or sections of 'git-fast-import(1)'. In upcoming commits, we want to split out these tests into individual files for better discoverability. First, we need to remove the dependency tests have on preceding tests. Modify the tests in 'series B' to each run in a new repository, which is removed when the test completes, so that they neither depend on nor leave behind any state. The 'B: fail on invalid blob sha1' and 'B: accept branch name "TEMP_TAG"' tests import on top of 'main', which used to exist from earlier tests. Create it with 'test_commit', so that the first import can only fail because of the invalid blob ID. The 'fsck' tests require the whole repository to be free of unreachable objects. They only passed because of the garbage collection in the cleanup of other tests. A new repository makes that unnecessary. Signed-off-by: Karthik Nayak --- t/t9300-fast-import.sh | 472 ++++++++++++++++++++++++++++--------------------- 1 file changed, 275 insertions(+), 197 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index fb23492202..1b34f6491c 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -358,274 +358,352 @@ test_expect_success 'A: export marks with large values' ' ### test_expect_success 'B: fail on invalid blob sha1' ' - 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 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 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/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 <input <<-INPUT_END && - commit refs/heads/invalid-timezone - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 - data <out && - test_grep "1234567890 [+]051800" out + cat >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' ' - cat >input <<-INPUT_END && - commit refs/heads/empty-committer-2 - committer $GIT_COMMITTER_DATE - data <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 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 > $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 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 && - 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 && + blob + mark :1 + data < $GIT_COMMITTER_DATE - 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 && + 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 <