mirror of
https://github.com/git/git.git
synced 2024-05-07 20:56:09 +02:00
d097a23bfa
When cloning directly from a local repository, we load a list of refs based on scanning the $GIT_DIR/refs/ directory of the "server" repository. If files exist in that directory that do not parse as hexadecimal hashes, then the ref array used by write_remote_refs() ends up with some entries with null OIDs. This causes us to hit a BUG() statement in ref_transaction_create(): BUG: create called without valid new_oid This BUG() call used to be a die() until033abf97f(Replace all die("BUG: ...") calls by BUG() ones, 2018-05-02). Before that, the die() was added byf04c5b552(ref_transaction_create(): check that new_sha1 is valid, 2015-02-17). The original report for this bug [1] mentioned that this problem did not exist in Git 2.27.0. The failure bisects unsurprisingly to968f12fda(refs: turn on GIT_REF_PARANOIA by default, 2021-09-24). When GIT_REF_PARANOIA is enabled, this case always fails as far back as I am able to successfully compile and test the Git codebase. [1] https://github.com/git-for-windows/git/issues/3781 There are two approaches to consider here. One would be to remove this BUG() statement in favor of returning with an error. There are only two callers to ref_transaction_create(), so this would have a limited impact. The other approach would be to add special casing in 'git clone' to avoid this faulty input to the method. While I originally started with changing 'git clone', I decided that modifying ref_transaction_create() was a more complete solution. This prevents failing with a BUG() statement when we already have a good way to report an error (including a reason for that error) within the method. Both callers properly check the return value and die() with the error message, so this is an appropriate direction. The added test helps check against a regression, but does check that our intended error message is handled correctly. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
154 lines
3.8 KiB
Bash
Executable File
154 lines
3.8 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='test local clone'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
repo_is_hardlinked() {
|
|
find "$1/objects" -type f -links 1 >output &&
|
|
test_line_count = 0 output
|
|
}
|
|
|
|
test_expect_success 'preparing origin repository' '
|
|
: >file && git add . && git commit -m1 &&
|
|
git clone --bare . a.git &&
|
|
git clone --bare . x &&
|
|
test "$(cd a.git && git config --bool core.bare)" = true &&
|
|
test "$(cd x && git config --bool core.bare)" = true &&
|
|
git bundle create b1.bundle --all &&
|
|
git bundle create b2.bundle main &&
|
|
mkdir dir &&
|
|
cp b1.bundle dir/b3 &&
|
|
cp b1.bundle b4
|
|
'
|
|
|
|
test_expect_success 'local clone without .git suffix' '
|
|
git clone -l -s a b &&
|
|
(cd b &&
|
|
test "$(git config --bool core.bare)" = false &&
|
|
git fetch)
|
|
'
|
|
|
|
test_expect_success 'local clone with .git suffix' '
|
|
git clone -l -s a.git c &&
|
|
(cd c && git fetch)
|
|
'
|
|
|
|
test_expect_success 'local clone from x' '
|
|
git clone -l -s x y &&
|
|
(cd y && git fetch)
|
|
'
|
|
|
|
test_expect_success 'local clone from x.git that does not exist' '
|
|
test_must_fail git clone -l -s x.git z
|
|
'
|
|
|
|
test_expect_success 'With -no-hardlinks, local will make a copy' '
|
|
git clone --bare --no-hardlinks x w &&
|
|
! repo_is_hardlinked w
|
|
'
|
|
|
|
test_expect_success 'Even without -l, local will make a hardlink' '
|
|
rm -fr w &&
|
|
git clone -l --bare x w &&
|
|
repo_is_hardlinked w
|
|
'
|
|
|
|
test_expect_success 'local clone of repo with nonexistent ref in HEAD' '
|
|
echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
|
|
git clone a d &&
|
|
(cd d &&
|
|
git fetch &&
|
|
test ! -e .git/refs/remotes/origin/HEAD)
|
|
'
|
|
|
|
test_expect_success 'bundle clone without .bundle suffix' '
|
|
git clone dir/b3 &&
|
|
(cd b3 && git fetch)
|
|
'
|
|
|
|
test_expect_success 'bundle clone with .bundle suffix' '
|
|
git clone b1.bundle &&
|
|
(cd b1 && git fetch)
|
|
'
|
|
|
|
test_expect_success 'bundle clone from b4' '
|
|
git clone b4 bdl &&
|
|
(cd bdl && git fetch)
|
|
'
|
|
|
|
test_expect_success 'bundle clone from b4.bundle that does not exist' '
|
|
test_must_fail git clone b4.bundle bb
|
|
'
|
|
|
|
test_expect_success 'bundle clone with nonexistent HEAD' '
|
|
git clone b2.bundle b2 &&
|
|
(cd b2 &&
|
|
git fetch &&
|
|
test_must_fail git rev-parse --verify refs/heads/main)
|
|
'
|
|
|
|
test_expect_success 'clone empty repository' '
|
|
mkdir empty &&
|
|
(cd empty &&
|
|
git init &&
|
|
git config receive.denyCurrentBranch warn) &&
|
|
git clone empty empty-clone &&
|
|
test_tick &&
|
|
(cd empty-clone &&
|
|
echo "content" >> foo &&
|
|
git add foo &&
|
|
git commit -m "Initial commit" &&
|
|
git push origin main &&
|
|
expected=$(git rev-parse main) &&
|
|
actual=$(git --git-dir=../empty/.git rev-parse main) &&
|
|
test $actual = $expected)
|
|
'
|
|
|
|
test_expect_success 'clone empty repository, and then push should not segfault.' '
|
|
rm -fr empty/ empty-clone/ &&
|
|
mkdir empty &&
|
|
(cd empty && git init) &&
|
|
git clone empty empty-clone &&
|
|
(cd empty-clone &&
|
|
test_must_fail git push)
|
|
'
|
|
|
|
test_expect_success 'cloning non-existent directory fails' '
|
|
rm -rf does-not-exist &&
|
|
test_must_fail git clone does-not-exist
|
|
'
|
|
|
|
test_expect_success 'cloning non-git directory fails' '
|
|
rm -rf not-a-git-repo not-a-git-repo-clone &&
|
|
mkdir not-a-git-repo &&
|
|
test_must_fail git clone not-a-git-repo not-a-git-repo-clone
|
|
'
|
|
|
|
test_expect_success 'cloning file:// does not hardlink' '
|
|
git clone --bare file://"$(pwd)"/a non-local &&
|
|
! repo_is_hardlinked non-local
|
|
'
|
|
|
|
test_expect_success 'cloning a local path with --no-local does not hardlink' '
|
|
git clone --bare --no-local a force-nonlocal &&
|
|
! repo_is_hardlinked force-nonlocal
|
|
'
|
|
|
|
test_expect_success 'cloning locally respects "-u" for fetching refs' '
|
|
test_must_fail git clone --bare -u false a should_not_work.git
|
|
'
|
|
|
|
test_expect_success 'local clone from repo with corrupt refs fails gracefully' '
|
|
git init corrupt &&
|
|
test_commit -C corrupt one &&
|
|
echo a >corrupt/.git/refs/heads/topic &&
|
|
|
|
test_must_fail git clone corrupt working 2>err &&
|
|
grep "has a null OID" err
|
|
'
|
|
|
|
test_done
|