It has been reported[1] that starting in Git v2.45.0, cloning from a bundle
results in the default branch name advice message always being displayed
when it was previously not. It can be reproduced by the following:
git init bundle-repo &&
git -C bundle-repo --allow-empty -m init &&
git -C bundle-repo bundle create ../repo.bundle --all &&
git clone repo.bundle bundle-clone
This issue bisects to 199f44cb2ead (builtin/clone: allow remote helpers
to detect repo, 2024-02-27) where the refdb is partially initialized
during clones before remote helpers are executed. This partial
initilization creates the HEAD file and "refs/" directory.
A side-effect of this change is that the location of the first
`git_default_branch_name()` gets deferred to a later point of execution.
This matters because `git_default_branch_name()` only computes the
default branch name once and returns a cached value for subsequent
invocations. After this change, the `git_default_branch_name()` call
site that actually computes the value becomes `guess_remote_head()` and
is configured to always show the advice message.
Also, `guess_remote_head()` only invokes `git_default_branch_name()` in
cases where the transport is unable to figure out the remote HEAD and
must guess. This explains why the advice message gets printed for bundle
clones, but not all clones.
This series addresses the issue by adapting `guess_remote_head()` to
support configuring the underlying `git_default_branch_name()`, which
has since been renamed to `repo_default_branch_name()`, to be quiet and
suppress the advice message.
Changes since V1:
- Instead of adding an additional boolean to
`guess_remote_head()` to suppress the advice message, the
function is adapted to accepts flags that accoplish the same
thing.
- Added a test to validate that the advice message is not being
printed.
- While we are here, added another patch to allow the default
branch name advice message to be suppressrd by the
`--no-advice` option.
Thanks,
-Justin
[1]: <7EC98E2F-144D-4974-94F6-FC24B443651D@xxxxxxxxxxxx>
Justin Tobler (3):
remote: allow `guess_remote_head()` to suppress advice
builtin/clone: suppress unexpected default branch advice
advice: allow disabling default branch name advice
advice.c | 1 +
advice.h | 1 +
builtin/clone.c | 3 ++-
builtin/fetch.c | 2 +-
builtin/remote.c | 2 +-
refs.c | 3 ++-
remote.c | 10 ++++++----
remote.h | 11 +++++++----
t/t0001-init.sh | 8 ++++++++
t/t5607-clone-bundle.sh | 12 ++++++++++++
10 files changed, 41 insertions(+), 12 deletions(-)
base-commit: 683c54c999c301c2cd6f715c411407c413b1d84e
--
2.49.0
