| Message ID | 20250320014646.2899791-2-jltobler@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | clone: suppress unexpected advice message during clone | expand |
On Wed, Mar 19, 2025 at 08:46:45PM -0500, Justin Tobler wrote: > diff --git a/remote.h b/remote.h > index 6be5031f64..49c7b644bb 100644 > --- a/remote.h > +++ b/remote.h > @@ -395,7 +395,7 @@ struct ref *get_local_heads(void); > */ > struct ref *guess_remote_head(const struct ref *head, > const struct ref *refs, > - int all); > + int all, int quiet); I think instead of introducing another boolean parameter it would be preferable to have a preparatory commit that turns `all` into `flags`. Patrick
On 25/03/20 06:13AM, Patrick Steinhardt wrote: > On Wed, Mar 19, 2025 at 08:46:45PM -0500, Justin Tobler wrote: > > diff --git a/remote.h b/remote.h > > index 6be5031f64..49c7b644bb 100644 > > --- a/remote.h > > +++ b/remote.h > > @@ -395,7 +395,7 @@ struct ref *get_local_heads(void); > > */ > > struct ref *guess_remote_head(const struct ref *head, > > const struct ref *refs, > > - int all); > > + int all, int quiet); > > I think instead of introducing another boolean parameter it would be > preferable to have a preparatory commit that turns `all` into `flags`. That makes sense. I'll adapt the next version accordingly. Thanks, -Justin
Patrick Steinhardt <ps@pks.im> writes: > On Wed, Mar 19, 2025 at 08:46:45PM -0500, Justin Tobler wrote: >> diff --git a/remote.h b/remote.h >> index 6be5031f64..49c7b644bb 100644 >> --- a/remote.h >> +++ b/remote.h >> @@ -395,7 +395,7 @@ struct ref *get_local_heads(void); >> */ >> struct ref *guess_remote_head(const struct ref *head, >> const struct ref *refs, >> - int all); >> + int all, int quiet); > > I think instead of introducing another boolean parameter it would be > preferable to have a preparatory commit that turns `all` into `flags`. Good. And when we turn that into a set of bits "flags", make sure we make it unsigned, not signed int. Thanks.
diff --git a/builtin/clone.c b/builtin/clone.c index f14229abf4..9eb66234bc 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -450,7 +450,7 @@ static struct ref *wanted_peer_refs(struct clone_opts *opts, if (head) tail_link_ref(head, &tail); if (option_single_branch) - refs = to_free = guess_remote_head(head, refs, 0); + refs = to_free = guess_remote_head(head, refs, 0, 0); } else if (option_single_branch) { local_refs = NULL; tail = &local_refs; @@ -1523,7 +1523,7 @@ int cmd_clone(int argc, } remote_head = find_ref_by_name(refs, "HEAD"); - remote_head_points_at = guess_remote_head(remote_head, mapped_refs, 0); + remote_head_points_at = guess_remote_head(remote_head, mapped_refs, 0, 0); if (option_branch) { our_head_points_at = find_remote_branch(mapped_refs, option_branch); diff --git a/builtin/fetch.c b/builtin/fetch.c index 95fd0018b9..a4f5b3e683 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1638,7 +1638,7 @@ static int set_head(const struct ref *remote_refs, struct remote *remote) get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0); matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"), - fetch_map, 1); + fetch_map, 1, 0); for (ref = matches; ref; ref = ref->next) { string_list_append(&heads, strip_refshead(ref->name)); } diff --git a/builtin/remote.c b/builtin/remote.c index 1b7aad8838..ebd1a796d2 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -511,7 +511,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat get_fetch_map(remote_refs, &refspec, &fetch_map_tail, 0); matches = guess_remote_head(find_ref_by_name(remote_refs, "HEAD"), - fetch_map, 1); + fetch_map, 1, 0); for (ref = matches; ref; ref = ref->next) string_list_append(&states->heads, abbrev_branch(ref->name)); diff --git a/remote.c b/remote.c index e609cf5c56..e9e55ecdbf 100644 --- a/remote.c +++ b/remote.c @@ -2297,7 +2297,7 @@ struct ref *get_local_heads(void) struct ref *guess_remote_head(const struct ref *head, const struct ref *refs, - int all) + int all, int quiet) { const struct ref *r; struct ref *list = NULL; @@ -2316,7 +2316,7 @@ struct ref *guess_remote_head(const struct ref *head, /* If a remote branch exists with the default branch name, let's use it. */ if (!all) { - char *default_branch = repo_default_branch_name(the_repository, 0); + char *default_branch = repo_default_branch_name(the_repository, quiet); char *ref = xstrfmt("refs/heads/%s", default_branch); r = find_ref_by_name(refs, ref); diff --git a/remote.h b/remote.h index 6be5031f64..49c7b644bb 100644 --- a/remote.h +++ b/remote.h @@ -395,7 +395,7 @@ struct ref *get_local_heads(void); */ struct ref *guess_remote_head(const struct ref *head, const struct ref *refs, - int all); + int all, int quiet); /* Return refs which no longer exist on remote */ struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);
The `repo_default_branch_name()` invoked through `guess_remote_head()` is configured to always display the default branch advice message. Add an additional parameter to the `guess_remote_head()` function signature to enable suppression of advice messages and update call sites accordingly. Signed-off-by: Justin Tobler <jltobler@gmail.com> --- builtin/clone.c | 4 ++-- builtin/fetch.c | 2 +- builtin/remote.c | 2 +- remote.c | 4 ++-- remote.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)