68cb0b5253
During git-receive-pack(1), connectivity of the object graph is validated to ensure that the received packfile does not leave the repository in a broken state. This is done via git-rev-list(1) and walking the objects, which can be expensive for large repositories. Generally, this check is critical to avoid an incomplete received packfile from corrupting a repository. Server operators may have additional knowledge though around exactly how Git is being used on the server-side which can be used to facilitate more efficient connectivity computation of incoming objects. For example, if it can be ensured that all objects in a repository are connected and do not depend on any missing objects, the connectivity of newly written objects can be checked by walking the object graph containing only the new objects from the updated tips and identifying the missing objects which represent the boundary between the new objects and the repository. These boundary objects can be checked in the canonical repository to ensure the new objects connect as expected and thus avoid walking the rest of the object graph. Git itself cannot make the guarantees required for such an optimization as it is possible for a repository to contain an unreachable object that references a missing object without the repository being considered corrupt. Introduce the --skip-connectivity-check option for git-receive-pack(1) which bypasses this connectivity check to give more control to the server-side. Note that without proper server-side validation of newly received objects handled outside of Git, usage of this option risks corrupting a repository. Signed-off-by: Justin Tobler <jltobler@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
88 lines
2.7 KiB
Bash
Executable File
88 lines
2.7 KiB
Bash
Executable File
#!/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 >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 >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 <out >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_expect_success 'receive-pack missing objects bypasses 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 --skip-connectivity-check remote.git <out >actual 2>err &&
|
|
|
|
test_grep ! "missing necessary objects" actual &&
|
|
test_must_be_empty err &&
|
|
git -C remote.git cat-file -e $(git -C repo rev-parse HEAD) &&
|
|
test_must_fail git -C remote.git rev-list $(git -C repo rev-parse HEAD)
|
|
'
|
|
|
|
test_done
|