From: Karthik Nayak Date: Thu, 12 Nov 2026 17:34:12 GMT Subject: [PATCH v2 12/20] t9300: make the pack edges test self-contained Message-ID: <20261112-kn-fast-import-tests-1-v2-12-b8c3a0ab27e8@gmail.com> In-Reply-To: <20261112-kn-fast-import-tests-1-v2-0-b8c3a0ab27e8@gmail.com> Similar to the previous commits, modify the pack-edges tests to make them independent of state from previous tests. Pack edges are only recorded for packs which are kept, so set 'fastimport.unpackLimit' to 0 for the import. Create the repository with 'git init -b main', as the import builds on 'main' and t9302, where this test ends up, doesn't set 'GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME'. Signed-off-by: Karthik Nayak --- t/t9300-fast-import.sh | 90 +++++++++++++++++++++++++++++++------------------- 1 file changed, 56 insertions(+), 34 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 54394c892b..5b8550584e 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -1030,50 +1030,72 @@ test_expect_success 'H: verify file' ' ### test_expect_success 'I: export-pack-edges option forbidden by default' ' - echo "option git export-pack-edges=edges.list" >input && - test_must_fail git fast-import err && - test_grep "option ${SQ}export-pack-edges${SQ} forbidden in input without --allow-unsafe-features" err + test_when_finished "rm -rf repo" && + git init repo && + ( + cd repo && + echo "option git export-pack-edges=edges.list" >input && + test_must_fail git fast-import err && + test_grep "option ${SQ}export-pack-edges${SQ} forbidden in input without --allow-unsafe-features" err + ) ' test_expect_success 'I: export-pack-edges' ' - test_when_finished "rm edges.list" && - cat >input <<-INPUT_END && - commit refs/heads/export-boundary - 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 + from refs/heads/main + + INPUT_END + git -c fastimport.unpackLimit=0 fast-import \ + --export-pack-edges=edges.list 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_expect_success 'I: export-pack-edges via stdin' ' - test_when_finished "rm edges.list" && - cat >input <<-INPUT_END && - option git export-pack-edges=edges.list - commit refs/heads/export-boundary-2 - committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE - data <input <<-INPUT_END && + option git export-pack-edges=edges.list + 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-2) - EOF - sed -e s/pack-.*pack/pack-.pack/ edges.list >actual && - test_cmp expect actual + from refs/heads/main + + INPUT_END + + git -c fastimport.unpackLimit=0 fast-import \ + --allow-unsafe-features 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 + ) ' ### -- 2.56.GIT