2007-06-07 07:39:05 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='test local clone'
|
2020-11-19 07:44:35 +08:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-19 07:44:19 +08:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2007-06-07 07:39:05 +08:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
2012-05-26 11:42:53 +08:00
|
|
|
repo_is_hardlinked() {
|
|
|
|
find "$1/objects" -type f -links 1 >output &&
|
|
|
|
test_line_count = 0 output
|
|
|
|
}
|
2007-06-07 07:39:05 +08:00
|
|
|
|
|
|
|
test_expect_success 'preparing origin repository' '
|
|
|
|
: >file && git add . && git commit -m1 &&
|
|
|
|
git clone --bare . a.git &&
|
2007-08-16 11:55:44 +08:00
|
|
|
git clone --bare . x &&
|
2014-03-21 07:15:24 +08:00
|
|
|
test "$(cd a.git && git config --bool core.bare)" = true &&
|
|
|
|
test "$(cd x && git config --bool core.bare)" = true &&
|
2009-01-18 14:27:08 +08:00
|
|
|
git bundle create b1.bundle --all &&
|
2020-11-19 07:44:35 +08:00
|
|
|
git bundle create b2.bundle main &&
|
2008-03-01 03:16:19 +08:00
|
|
|
mkdir dir &&
|
2010-10-31 15:30:58 +08:00
|
|
|
cp b1.bundle dir/b3 &&
|
clone: use remote branch if it matches default HEAD
Usually clone tries to use the same local HEAD as the remote (unless the
user has given --branch explicitly). Even if the remote HEAD is detached
or unborn, we can detect those situations with modern versions of Git.
If the remote is too old to support the "unborn" extension (or it has
been disabled via config), then we can't know the name of the remote's
unborn HEAD, and we fall back whatever the local default branch name is
configured to be.
But that leads to one weird corner case. It's rare because it needs a
number of factors:
- the remote has an unborn HEAD
- the remote is too old to support "unborn", or has disabled it
- the remote has another branch "foo"
- the local default branch name is "foo"
In that case you end up with a local clone on an unborn "foo" branch,
disconnected completely from the remote's "foo". This is rare in
practice, but the result is quite confusing.
When choosing "foo", we can double check whether the remote has such a
name, and if so, start our local "foo" at the same spot, rather than
making it unborn.
Note that this causes a test failure in t5605, which is cloning from a
bundle that doesn't contain HEAD (so it behaves like a remote that
doesn't support "unborn"), but has a single "main" branch. That test
expects that we end up in the weird "unborn main" case, where we don't
actually check out the remote branch of the same name. Even though we
have to update the test, this seems like an argument in favor of this
patch: checking out main is what I'd expect from such a bundle.
So this patch updates the test for the new behavior and adds an adjacent
one that checks what the original was going for: if there's no HEAD and
the bundle _doesn't_ have a branch that matches our local default name,
then we end up with nothing checked out.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-08 07:59:35 +08:00
|
|
|
cp b1.bundle b4 &&
|
|
|
|
git branch not-main main &&
|
|
|
|
git bundle create b5.bundle not-main
|
2007-06-07 07:39:05 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'local clone without .git suffix' '
|
|
|
|
git clone -l -s a b &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd b &&
|
2014-03-21 07:15:24 +08:00
|
|
|
test "$(git config --bool core.bare)" = false &&
|
2012-05-26 11:42:53 +08:00
|
|
|
git fetch)
|
2007-06-07 07:39:05 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'local clone with .git suffix' '
|
|
|
|
git clone -l -s a.git c &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd c && git fetch)
|
2007-06-07 07:39:05 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'local clone from x' '
|
|
|
|
git clone -l -s x y &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd y && git fetch)
|
2007-06-07 07:39:05 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'local clone from x.git that does not exist' '
|
2012-05-26 11:42:53 +08:00
|
|
|
test_must_fail git clone -l -s x.git z
|
2007-06-07 07:39:05 +08:00
|
|
|
'
|
|
|
|
|
git-clone: aggressively optimize local clone behaviour.
This changes the behaviour of cloning from a repository on the
local machine, by defaulting to "-l" (use hardlinks to share
files under .git/objects) and making "-l" a no-op. A new
option, --no-hardlinks, is also added to cause file-level copy
of files under .git/objects while still avoiding the normal
"pack to pipe, then receive and index pack" network transfer
overhead. The old behaviour of local cloning without -l nor -s
is availble by specifying the source repository with the newly
introduced file:///path/to/repo.git/ syntax (i.e. "same as
network" cloning).
* With --no-hardlinks (i.e. have all .git/objects/ copied via
cpio) would not catch the source repository corruption, and
also risks corrupted recipient repository if an
alpha-particle hits memory cell while indexing and resolving
deltas. As long as the recipient is created uncorrupted, you
have a good back-up.
* same-as-network is expensive, but it would catch the breakage
of the source repository. It still risks corrupted recipient
repository due to hardware failure. As long as the recipient
is created uncorrupted, you have a good back-up.
* The new default on the same filesystem, as long as the source
repository is healthy, it is very likely that the recipient
would be, too. Also it is very cheap. You do not get any
back-up benefit, though.
None of the method is resilient against the source repository
corruption, so let's discount that from the comparison. Then
the difference with and without --no-hardlinks matters primarily
if you value the back-up benefit or not. If you want to use the
cloned repository as a back-up, then it is cheaper to do a clone
with --no-hardlinks and two git-fsck (source before clone,
recipient after clone) than same-as-network clone, especially as
you are likely to do a git-fsck on the recipient if you are so
paranoid anyway.
Which leads me to believe that being able to use file:/// is
probably a good idea, if only for testability, but probably of
little practical value. We default to hardlinked clone for
everyday use, and paranoids can use --no-hardlinks as a way to
make a back-up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-02 14:42:36 +08:00
|
|
|
test_expect_success 'With -no-hardlinks, local will make a copy' '
|
|
|
|
git clone --bare --no-hardlinks x w &&
|
2012-05-26 11:42:53 +08:00
|
|
|
! repo_is_hardlinked w
|
git-clone: aggressively optimize local clone behaviour.
This changes the behaviour of cloning from a repository on the
local machine, by defaulting to "-l" (use hardlinks to share
files under .git/objects) and making "-l" a no-op. A new
option, --no-hardlinks, is also added to cause file-level copy
of files under .git/objects while still avoiding the normal
"pack to pipe, then receive and index pack" network transfer
overhead. The old behaviour of local cloning without -l nor -s
is availble by specifying the source repository with the newly
introduced file:///path/to/repo.git/ syntax (i.e. "same as
network" cloning).
* With --no-hardlinks (i.e. have all .git/objects/ copied via
cpio) would not catch the source repository corruption, and
also risks corrupted recipient repository if an
alpha-particle hits memory cell while indexing and resolving
deltas. As long as the recipient is created uncorrupted, you
have a good back-up.
* same-as-network is expensive, but it would catch the breakage
of the source repository. It still risks corrupted recipient
repository due to hardware failure. As long as the recipient
is created uncorrupted, you have a good back-up.
* The new default on the same filesystem, as long as the source
repository is healthy, it is very likely that the recipient
would be, too. Also it is very cheap. You do not get any
back-up benefit, though.
None of the method is resilient against the source repository
corruption, so let's discount that from the comparison. Then
the difference with and without --no-hardlinks matters primarily
if you value the back-up benefit or not. If you want to use the
cloned repository as a back-up, then it is cheaper to do a clone
with --no-hardlinks and two git-fsck (source before clone,
recipient after clone) than same-as-network clone, especially as
you are likely to do a git-fsck on the recipient if you are so
paranoid anyway.
Which leads me to believe that being able to use file:/// is
probably a good idea, if only for testability, but probably of
little practical value. We default to hardlinked clone for
everyday use, and paranoids can use --no-hardlinks as a way to
make a back-up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-02 14:42:36 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'Even without -l, local will make a hardlink' '
|
|
|
|
rm -fr w &&
|
|
|
|
git clone -l --bare x w &&
|
2012-05-26 11:42:53 +08:00
|
|
|
repo_is_hardlinked w
|
git-clone: aggressively optimize local clone behaviour.
This changes the behaviour of cloning from a repository on the
local machine, by defaulting to "-l" (use hardlinks to share
files under .git/objects) and making "-l" a no-op. A new
option, --no-hardlinks, is also added to cause file-level copy
of files under .git/objects while still avoiding the normal
"pack to pipe, then receive and index pack" network transfer
overhead. The old behaviour of local cloning without -l nor -s
is availble by specifying the source repository with the newly
introduced file:///path/to/repo.git/ syntax (i.e. "same as
network" cloning).
* With --no-hardlinks (i.e. have all .git/objects/ copied via
cpio) would not catch the source repository corruption, and
also risks corrupted recipient repository if an
alpha-particle hits memory cell while indexing and resolving
deltas. As long as the recipient is created uncorrupted, you
have a good back-up.
* same-as-network is expensive, but it would catch the breakage
of the source repository. It still risks corrupted recipient
repository due to hardware failure. As long as the recipient
is created uncorrupted, you have a good back-up.
* The new default on the same filesystem, as long as the source
repository is healthy, it is very likely that the recipient
would be, too. Also it is very cheap. You do not get any
back-up benefit, though.
None of the method is resilient against the source repository
corruption, so let's discount that from the comparison. Then
the difference with and without --no-hardlinks matters primarily
if you value the back-up benefit or not. If you want to use the
cloned repository as a back-up, then it is cheaper to do a clone
with --no-hardlinks and two git-fsck (source before clone,
recipient after clone) than same-as-network clone, especially as
you are likely to do a git-fsck on the recipient if you are so
paranoid anyway.
Which leads me to believe that being able to use file:/// is
probably a good idea, if only for testability, but probably of
little practical value. We default to hardlinked clone for
everyday use, and paranoids can use --no-hardlinks as a way to
make a back-up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-02 14:42:36 +08:00
|
|
|
'
|
|
|
|
|
2008-02-20 23:10:17 +08:00
|
|
|
test_expect_success 'local clone of repo with nonexistent ref in HEAD' '
|
|
|
|
echo "ref: refs/heads/nonexistent" > a.git/HEAD &&
|
|
|
|
git clone a d &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd d &&
|
2008-02-20 23:10:17 +08:00
|
|
|
git fetch &&
|
2012-05-26 11:42:53 +08:00
|
|
|
test ! -e .git/refs/remotes/origin/HEAD)
|
|
|
|
'
|
2008-02-20 23:10:17 +08:00
|
|
|
|
2008-03-01 03:16:19 +08:00
|
|
|
test_expect_success 'bundle clone without .bundle suffix' '
|
|
|
|
git clone dir/b3 &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd b3 && git fetch)
|
2008-03-01 03:16:19 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bundle clone with .bundle suffix' '
|
|
|
|
git clone b1.bundle &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd b1 && git fetch)
|
2008-03-01 03:16:19 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bundle clone from b4' '
|
|
|
|
git clone b4 bdl &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd bdl && git fetch)
|
2008-03-01 03:16:19 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bundle clone from b4.bundle that does not exist' '
|
2012-05-26 11:42:53 +08:00
|
|
|
test_must_fail git clone b4.bundle bb
|
2008-03-01 03:16:19 +08:00
|
|
|
'
|
|
|
|
|
clone: use remote branch if it matches default HEAD
Usually clone tries to use the same local HEAD as the remote (unless the
user has given --branch explicitly). Even if the remote HEAD is detached
or unborn, we can detect those situations with modern versions of Git.
If the remote is too old to support the "unborn" extension (or it has
been disabled via config), then we can't know the name of the remote's
unborn HEAD, and we fall back whatever the local default branch name is
configured to be.
But that leads to one weird corner case. It's rare because it needs a
number of factors:
- the remote has an unborn HEAD
- the remote is too old to support "unborn", or has disabled it
- the remote has another branch "foo"
- the local default branch name is "foo"
In that case you end up with a local clone on an unborn "foo" branch,
disconnected completely from the remote's "foo". This is rare in
practice, but the result is quite confusing.
When choosing "foo", we can double check whether the remote has such a
name, and if so, start our local "foo" at the same spot, rather than
making it unborn.
Note that this causes a test failure in t5605, which is cloning from a
bundle that doesn't contain HEAD (so it behaves like a remote that
doesn't support "unborn"), but has a single "main" branch. That test
expects that we end up in the weird "unborn main" case, where we don't
actually check out the remote branch of the same name. Even though we
have to update the test, this seems like an argument in favor of this
patch: checking out main is what I'd expect from such a bundle.
So this patch updates the test for the new behavior and adds an adjacent
one that checks what the original was going for: if there's no HEAD and
the bundle _doesn't_ have a branch that matches our local default name,
then we end up with nothing checked out.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-08 07:59:35 +08:00
|
|
|
test_expect_success 'bundle clone with nonexistent HEAD (match default)' '
|
2008-03-01 03:16:19 +08:00
|
|
|
git clone b2.bundle b2 &&
|
2012-05-26 11:42:53 +08:00
|
|
|
(cd b2 &&
|
2010-10-31 15:30:58 +08:00
|
|
|
git fetch &&
|
clone: use remote branch if it matches default HEAD
Usually clone tries to use the same local HEAD as the remote (unless the
user has given --branch explicitly). Even if the remote HEAD is detached
or unborn, we can detect those situations with modern versions of Git.
If the remote is too old to support the "unborn" extension (or it has
been disabled via config), then we can't know the name of the remote's
unborn HEAD, and we fall back whatever the local default branch name is
configured to be.
But that leads to one weird corner case. It's rare because it needs a
number of factors:
- the remote has an unborn HEAD
- the remote is too old to support "unborn", or has disabled it
- the remote has another branch "foo"
- the local default branch name is "foo"
In that case you end up with a local clone on an unborn "foo" branch,
disconnected completely from the remote's "foo". This is rare in
practice, but the result is quite confusing.
When choosing "foo", we can double check whether the remote has such a
name, and if so, start our local "foo" at the same spot, rather than
making it unborn.
Note that this causes a test failure in t5605, which is cloning from a
bundle that doesn't contain HEAD (so it behaves like a remote that
doesn't support "unborn"), but has a single "main" branch. That test
expects that we end up in the weird "unborn main" case, where we don't
actually check out the remote branch of the same name. Even though we
have to update the test, this seems like an argument in favor of this
patch: checking out main is what I'd expect from such a bundle.
So this patch updates the test for the new behavior and adds an adjacent
one that checks what the original was going for: if there's no HEAD and
the bundle _doesn't_ have a branch that matches our local default name,
then we end up with nothing checked out.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-07-08 07:59:35 +08:00
|
|
|
git rev-parse --verify refs/heads/main)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'bundle clone with nonexistent HEAD (no match default)' '
|
|
|
|
git clone b5.bundle b5 &&
|
|
|
|
(cd b5 &&
|
|
|
|
git fetch &&
|
|
|
|
test_must_fail git rev-parse --verify refs/heads/main &&
|
|
|
|
test_must_fail git rev-parse --verify refs/heads/not-main)
|
2008-03-01 03:16:19 +08:00
|
|
|
'
|
|
|
|
|
2009-01-23 08:07:32 +08:00
|
|
|
test_expect_success 'clone empty repository' '
|
|
|
|
mkdir empty &&
|
2009-02-11 18:28:03 +08:00
|
|
|
(cd empty &&
|
|
|
|
git init &&
|
|
|
|
git config receive.denyCurrentBranch warn) &&
|
2009-01-23 08:07:32 +08:00
|
|
|
git clone empty empty-clone &&
|
|
|
|
test_tick &&
|
2018-07-02 08:24:01 +08:00
|
|
|
(cd empty-clone &&
|
2009-01-23 08:07:32 +08:00
|
|
|
echo "content" >> foo &&
|
|
|
|
git add foo &&
|
|
|
|
git commit -m "Initial commit" &&
|
2020-11-19 07:44:35 +08:00
|
|
|
git push origin main &&
|
|
|
|
expected=$(git rev-parse main) &&
|
|
|
|
actual=$(git --git-dir=../empty/.git rev-parse main) &&
|
2009-01-23 08:07:32 +08:00
|
|
|
test $actual = $expected)
|
|
|
|
'
|
|
|
|
|
2009-04-20 19:09:37 +08:00
|
|
|
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 &&
|
2009-04-28 06:12:31 +08:00
|
|
|
(cd empty-clone &&
|
|
|
|
test_must_fail git push)
|
2009-04-20 19:09:37 +08:00
|
|
|
'
|
|
|
|
|
2011-02-18 12:01:52 +08:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2012-05-30 19:10:16 +08:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
clone: always set transport options
A clone will always create a transport struct, whether we
are cloning locally or using an actual protocol. In the
local case, we only use the transport to get the list of
refs, and then transfer the objects out-of-band.
However, there are many options that we do not bother
setting up in the local case. For the most part, these are
noops, because they only affect the object-fetching stage
(e.g., the --depth option). However, some options do have a
visible impact. For example, giving the path to upload-pack
via "-u" does not currently work for a local clone, even
though we need upload-pack to get the ref list.
We can just drop the conditional entirely and set these
options for both local and non-local clones. Rather than
keep track of which options impact the object versus the ref
fetching stage, we can simply let the noops be noops (and
the cost of setting the options in the first place is not
high).
The one exception is that we also check that the transport
provides both a "get_refs_list" and a "fetch" method. We
will now be checking the former for both cases (which is
good, since a transport that cannot fetch refs would not
work for a local clone), and we tweak the conditional to
check for a "fetch" only when we are non-local.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-09-19 04:35:13 +08:00
|
|
|
test_expect_success 'cloning locally respects "-u" for fetching refs' '
|
|
|
|
test_must_fail git clone --bare -u false a should_not_work.git
|
|
|
|
'
|
|
|
|
|
clone: die() instead of BUG() on bad refs
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() until 033abf97f (Replace all
die("BUG: ...") calls by BUG() ones, 2018-05-02). Before that, the die()
was added by f04c5b552 (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 to 968f12fda
(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>
2022-04-25 21:47:30 +08:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2007-06-07 07:39:05 +08:00
|
|
|
test_done
|