From: Karthik Nayak Date: Thu, 12 Nov 2026 17:34:17 GMT Subject: [PATCH v2 17/20] t9300: make the stream tests self-contained Message-ID: <20261112-kn-fast-import-tests-1-v2-17-b8c3a0ab27e8@gmail.com> In-Reply-To: <20261112-kn-fast-import-tests-1-v2-0-b8c3a0ab27e8@gmail.com> Similar to the previous commits, modify the tests in 'series R' which check empty and truncated streams, the 'quiet' option and the 'done' feature to make them independent of state from previous tests. 'empty stream succeeds' no longer needs to configure 'fastimport.unpackLimit', as that was moved to the first test needing it by an earlier commit. Signed-off-by: Karthik Nayak --- t/t9300-fast-import.sh | 154 ++++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 53 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 5f84c66ac4..45720ed003 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -38,11 +38,23 @@ echo "$@"' ### test_expect_success 'empty stream succeeds' ' - git fast-import input <<-EOF && - option git quiet - blob - data 3 - hi + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && - EOF + cat >input <<-EOF && + option git quiet + blob + data 3 + hi - git fast-import 2>output 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_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + cat >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' ' @@ -3615,19 +3651,31 @@ test_expect_success 'R: blob bigger than threshold' ' ' test_expect_success 'R: --git-completion-helper does not read from stdin' ' - find .git/objects/pack -name "tmp_pack_*" >before && - echo garbage | git fast-import --git-completion-helper >out && - test_grep -e "--date-format=" out && - find .git/objects/pack -name "tmp_pack_*" >after && - test_cmp before after + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + find .git/objects/pack -name "tmp_pack_*" >before && + echo garbage | git fast-import --git-completion-helper >out && + test_grep -e "--date-format=" out && + find .git/objects/pack -name "tmp_pack_*" >after && + test_cmp before after + ) ' test_expect_success 'R: --git-completion-helper-all does not read from stdin' ' - find .git/objects/pack -name "tmp_pack_*" >before && - echo garbage | git fast-import --git-completion-helper-all >all && - test_grep -e "--allow-unsafe-features" all && - find .git/objects/pack -name "tmp_pack_*" >after && - test_cmp before after + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + + find .git/objects/pack -name "tmp_pack_*" >before && + echo garbage | git fast-import --git-completion-helper-all >all && + test_grep -e "--allow-unsafe-features" all && + find .git/objects/pack -name "tmp_pack_*" >after && + test_cmp before after + ) ' ### -- 2.56.GIT