Skip to content

Commit c039a46

Browse files
jltoblergitster
authored andcommitted
builtin/clone: suppress unexpected default branch advice
In 199f44c (builtin/clone: allow remote helpers to detect repo, 2024-02-27), clones started partially initializing the refdb before executing the remote helpers by creating a HEAD file and "refs/" directory. This has resulted in some scenarios where git-clone(1) now prints the default branch name advice message where it previously did not. A side-effect of the HEAD file already existing, is that computation of the default branch name is handled later in execution. This matters because prior to 97abaab (refs: drop `git_default_branch_name()`, 2024-05-17), the default branch value would be computed during its first execution and cached. Subsequent invocations would simply return the cached value. Since the next `git_default_branch_name()` call site, which is invoked through `guess_remote_head()`, is not configured to suppress the advice message, computing the default branch name results in the advice message being printed. Configure `guess_remote_head()` to suppress the advice message, restoring the previous behavior. Signed-off-by: Justin Tobler <[email protected]> Acked-by: Phillip Wood <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d5d284d commit c039a46

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

builtin/clone.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,9 @@ static struct ref *wanted_peer_refs(struct clone_opts *opts,
450450
if (head)
451451
tail_link_ref(head, &tail);
452452
if (option_single_branch)
453-
refs = to_free = guess_remote_head(head, refs, 0);
453+
refs = to_free =
454+
guess_remote_head(head, refs,
455+
REMOTE_GUESS_HEAD_QUIET);
454456
} else if (option_single_branch) {
455457
local_refs = NULL;
456458
tail = &local_refs;
@@ -1523,7 +1525,8 @@ int cmd_clone(int argc,
15231525
}
15241526

15251527
remote_head = find_ref_by_name(refs, "HEAD");
1526-
remote_head_points_at = guess_remote_head(remote_head, mapped_refs, 0);
1528+
remote_head_points_at = guess_remote_head(remote_head, mapped_refs,
1529+
REMOTE_GUESS_HEAD_QUIET);
15271530

15281531
if (option_branch) {
15291532
our_head_points_at = find_remote_branch(mapped_refs, option_branch);

t/t5607-clone-bundle.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,4 +211,16 @@ test_expect_success 'git bundle v3 rejects unknown capabilities' '
211211
test_grep "unknown capability .unknown=silly." output
212212
'
213213

214+
test_expect_success 'cloning bundle suppresses default branch name advice' '
215+
test_when_finished "rm -rf bundle-repo clone-repo" &&
216+
217+
git init bundle-repo &&
218+
git -C bundle-repo commit --allow-empty -m init &&
219+
git -C bundle-repo bundle create repo.bundle --all &&
220+
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
221+
git clone --single-branch bundle-repo/repo.bundle clone-repo 2>err &&
222+
223+
test_grep ! "hint: " err
224+
'
225+
214226
test_done

0 commit comments

Comments
 (0)