From 95262afe788e0b6b4ae5ff37e8d28fb5883c1a82 Mon Sep 17 00:00:00 2001 From: Justin Tobler Date: Tue, 20 May 2025 11:32:17 -0500 Subject: t5410: test receive-pack connectivity check As part of git-recieve-pack(1), the connectivity of objects is checked. Add a test validating that git-receive-pack(1) fails due to an incoming packfile that would leave the repository with missing objects. Instead of creating a new test file, "t5410" is generalized for receive-pack testing. Signed-off-by: Justin Tobler Signed-off-by: Junio C Hamano --- t/meson.build | 2 +- t/t5410-receive-pack-alternates.sh | 44 -------------------------- t/t5410-receive-pack.sh | 65 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 45 deletions(-) delete mode 100755 t/t5410-receive-pack-alternates.sh create mode 100755 t/t5410-receive-pack.sh diff --git a/t/meson.build b/t/meson.build index fcfc1c2c2b..d052fc3e23 100644 --- a/t/meson.build +++ b/t/meson.build @@ -629,7 +629,7 @@ integration_tests = [ 't5407-post-rewrite-hook.sh', 't5408-send-pack-stdin.sh', 't5409-colorize-remote-messages.sh', - 't5410-receive-pack-alternates.sh', + 't5410-receive-pack.sh', 't5411-proc-receive-hook.sh', 't5500-fetch-pack.sh', 't5501-fetch-push-alternates.sh', diff --git a/t/t5410-receive-pack-alternates.sh b/t/t5410-receive-pack-alternates.sh deleted file mode 100755 index 4e82fd102e..0000000000 --- a/t/t5410-receive-pack-alternates.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -test_description='git receive-pack with alternate ref filtering' - -GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main -export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit base && - git clone -s --bare . fork && - git checkout -b public/branch main && - test_commit public && - git checkout -b private/branch main && - test_commit private -' - -extract_haves () { - depacketize | sed -n 's/^\([^ ][^ ]*\) \.have/\1/p' -} - -test_expect_success 'with core.alternateRefsCommand' ' - write_script fork/alternate-refs <<-\EOF && - git --git-dir="$1" for-each-ref \ - --format="%(objectname)" \ - refs/heads/public/ - EOF - test_config -C fork core.alternateRefsCommand ./alternate-refs && - git rev-parse public/branch >expect && - printf "0000" | git receive-pack fork >actual && - extract_haves actual.haves && - test_cmp expect actual.haves -' - -test_expect_success 'with core.alternateRefsPrefixes' ' - test_config -C fork core.alternateRefsPrefixes "refs/heads/private" && - git rev-parse private/branch >expect && - printf "0000" | git receive-pack fork >actual && - extract_haves actual.haves && - test_cmp expect actual.haves -' - -test_done diff --git a/t/t5410-receive-pack.sh b/t/t5410-receive-pack.sh new file mode 100755 index 0000000000..9afea54a26 --- /dev/null +++ b/t/t5410-receive-pack.sh @@ -0,0 +1,65 @@ +#!/bin/sh + +test_description='git receive-pack' + +GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main +export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME + +. ./test-lib.sh + +test_expect_success 'setup' ' + test_commit base && + git clone -s --bare . fork && + git checkout -b public/branch main && + test_commit public && + git checkout -b private/branch main && + test_commit private +' + +extract_haves () { + depacketize | sed -n 's/^\([^ ][^ ]*\) \.have/\1/p' +} + +test_expect_success 'with core.alternateRefsCommand' ' + write_script fork/alternate-refs <<-\EOF && + git --git-dir="$1" for-each-ref \ + --format="%(objectname)" \ + refs/heads/public/ + EOF + test_config -C fork core.alternateRefsCommand ./alternate-refs && + git rev-parse public/branch >expect && + printf "0000" | git receive-pack fork >actual && + extract_haves actual.haves && + test_cmp expect actual.haves +' + +test_expect_success 'with core.alternateRefsPrefixes' ' + test_config -C fork core.alternateRefsPrefixes "refs/heads/private" && + git rev-parse private/branch >expect && + printf "0000" | git receive-pack fork >actual && + extract_haves actual.haves && + test_cmp expect actual.haves +' + +test_expect_success 'receive-pack missing objects fails connectivity check' ' + test_when_finished rm -rf repo remote.git setup.git && + + git init repo && + git -C repo commit --allow-empty -m 1 && + git clone --bare repo setup.git && + git -C repo commit --allow-empty -m 2 && + + # Capture git-send-pack(1) output sent to git-receive-pack(1). + git -C repo send-pack ../setup.git --all \ + --receive-pack="tee ${SQ}$(pwd)/out${SQ} | git-receive-pack" && + + # Replay captured git-send-pack(1) output on new empty repository. + git init --bare remote.git && + git receive-pack remote.git actual 2>err && + + test_grep "missing necessary objects" actual && + test_grep "fatal: Failed to traverse parents" err && + test_must_fail git -C remote.git cat-file -e $(git -C repo rev-parse HEAD) +' + +test_done -- cgit v1.3