[PATCH v2] remote.c: defer remote.<name>.followRemoteHEAD validation
- From
Colin Hinton <colinlewishinton@gmail.com>
- Date
- Oct 23, 2026, 18:50 UTC
- Message-ID
- <20261023185007.21642-1-colinlewishinton@gmail.com>
- In-Reply-To
- <20261018235508.848-1-colinlewishinton@gmail.com>
Continuing from 86129fd (fetch.c: defer fetch.followRemoteHEAD validation), apply the same treatment to remote.<name>.followRemoteHEAD, which is still validated in handle_config(). That emits a warning for any command that loads the remote configuration, such as "git push" or "git remote -v", even though only "git fetch" ever consults the value.
Store the raw string in struct remote instead, and resolve it lazily in do_fetch() through the get_follow_remote_head() helper introduced by 86129fd. This replaces the parsed follow_remote_head and no_warn_branch members, and the NEEDSWORK comment left behind by 86129fd is removed. "git remote set-head" now compares against the raw string to decide whether to rewrite "always" to "warn".
Moved enum follow_remote_head_settings to builtin/fetch.c as it is no longer referenced in remote.
Messages for an unrecognized or missing value name the full variable name prefix, as the helper now serves both the fetch-level and the remote-level setting.
Signed-off-by: Colin Hinton <colinlewishinton@gmail.com> --- Documentation/config/remote.adoc | 4 +-- builtin/fetch.c | 45 +++++++++++++++++++++----------- builtin/remote.c | 3 ++- remote.c | 28 +++----------------- remote.h | 13 ++------- t/t5510-fetch.sh | 18 +++++++++++++ 6 files changed, 58 insertions(+), 53 deletions(-)
diff --git a/Documentation/config/remote.adoc b/Documentation/config/remote.adoc index 3a20d0f752..d19fe88ef3 100644 --- a/Documentation/config/remote.adoc +++ b/Documentation/config/remote.adoc @@ -173,5 +173,5 @@ remote.<name>.followRemoteHEAD:: accepted values. + In addition to the values supported by `fetch.followRemoteHEAD`, this setting -may also take on the value "warn-if-not-`$branch`", which behaves like "warn", -but ignores the warning if the remote's `HEAD` is `remotes/<name>/$branch`. +may also take on the value "warn-if-not-`<branch>`", which behaves like "warn", +but ignores the warning if the remote's `HEAD` is `remotes/<name>/<branch>`. diff --git a/builtin/fetch.c b/builtin/fetch.c index 1f76ae6242..bb59e70865 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -65,6 +65,15 @@ enum display_format { DISPLAY_FORMAT_PORCELAIN, }; +#define BUILTIN_FOLLOW_REMOTE_HEAD_DFLT FOLLOW_REMOTE_CREATE +enum follow_remote_head_settings { + FOLLOW_REMOTE_UNCONFIGURED = 0, + FOLLOW_REMOTE_NEVER, + FOLLOW_REMOTE_CREATE, + FOLLOW_REMOTE_WARN, + FOLLOW_REMOTE_ALWAYS, +}; + struct display_state { struct strbuf buf; @@ -187,19 +196,22 @@ static int git_fetch_config(const char *k, const char *v, return git_default_config(k, v, ctx, cb); } -static enum follow_remote_head_settings get_follow_remote_head(const char *setting) +static enum follow_remote_head_settings get_follow_remote_head(const char *setting, + const char *key, const char **no_warn_branch) { if (!setting) - die(_("missing value for 'fetch.followRemoteHEAD'")); + die(_("missing value for '%s'"), key); else if (!strcmp(setting, "never")) return FOLLOW_REMOTE_NEVER; else if (!strcmp(setting, "create")) return FOLLOW_REMOTE_CREATE; else if (!strcmp(setting, "warn")) return FOLLOW_REMOTE_WARN; + else if (no_warn_branch && skip_prefix(setting, "warn-if-not-", no_warn_branch)) + return FOLLOW_REMOTE_WARN; else if (!strcmp(setting, "always")) return FOLLOW_REMOTE_ALWAYS; - warning(_("unrecognized fetch.followRemoteHEAD value '%s' ignored"), setting); + warning(_("unrecognized %s value '%s' ignored"), key, setting); return BUILTIN_FOLLOW_REMOTE_HEAD_DFLT; } @@ -1760,12 +1772,11 @@ static void warn_set_head(const char *remote, const char *head_name, } static int set_head(const struct ref *remote_refs, struct remote *remote, - int follow_remote_head) + int follow_remote_head, const char *no_warn_branch) { int result = 0, create_only, baremirror, was_detached; struct strbuf b_head = STRBUF_INIT, b_remote_head = STRBUF_INIT, b_local_head = STRBUF_INIT; - const char *no_warn_branch = remote->no_warn_branch; char *head_name = NULL; struct ref *ref, *matches; struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map; @@ -1955,6 +1966,7 @@ static int do_fetch(struct transport *transport, struct strmap rejected_refs = STRMAP_INIT; int summary_width = 0; int follow_remote_head = FOLLOW_REMOTE_NEVER; + const char *no_warn_branch = NULL; if (tags == TAGS_DEFAULT) { if (transport->remote->fetch_tags == 2) @@ -1978,16 +1990,19 @@ static int do_fetch(struct transport *transport, if (transport->remote->fetch.nr) { refspec_ref_prefixes(&transport->remote->fetch, &transport_ls_refs_options.ref_prefixes); - /* - * See remote.c's handling of remote.<name>.followRemoteHEAD - * for the analogous, still-unresolved case. - */ - if (transport->remote->follow_remote_head) - follow_remote_head = transport->remote->follow_remote_head; - else if (config->follow_remote_head_seen) - follow_remote_head = get_follow_remote_head(config->follow_remote_head_raw); - else + if (transport->remote->follow_remote_head_seen) { + char *key = xstrfmt("remote.%s.followRemoteHEAD", transport->remote->name); + follow_remote_head = get_follow_remote_head( + transport->remote->follow_remote_head_raw, + key, &no_warn_branch); + free(key); + } else if (config->follow_remote_head_seen) { + follow_remote_head = get_follow_remote_head( + config->follow_remote_head_raw, + "fetch.followRemoteHEAD", NULL); + } else { follow_remote_head = BUILTIN_FOLLOW_REMOTE_HEAD_DFLT; + } } if (branch && branch_has_merge_config(branch) && !strcmp(branch->remote_name, transport->remote->name)) { @@ -2195,7 +2210,7 @@ static int do_fetch(struct transport *transport, * Way too many cases where this can go wrong so let's just * ignore errors and fail silently for now. */ - set_head(remote_refs, transport->remote, follow_remote_head); + set_head(remote_refs, transport->remote, follow_remote_head, no_warn_branch); } cleanup: diff --git a/builtin/remote.c b/builtin/remote.c index fb7e5b114f..aad92c7dcd 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1606,7 +1606,8 @@ static int set_head(int argc, const char **argv, const char *prefix, } if (opt_a) report_set_head_auto(argv[0], head_name, &b_local_head, was_detached); - if (remote->follow_remote_head == FOLLOW_REMOTE_ALWAYS) { + if (remote->follow_remote_head_raw && + !strcmp(remote->follow_remote_head_raw, "always")) { struct strbuf config_name = STRBUF_INIT; strbuf_addf(&config_name, "remote.%s.followremotehead", remote->name); diff --git a/remote.c b/remote.c index 49ee2ea318..fa230005ff 100644 --- a/remote.c +++ b/remote.c @@ -184,6 +184,7 @@ static void remote_clear(struct remote *remote) string_list_clear(&remote->server_options, 0); string_list_clear(&remote->negotiation_restrict, 0); string_list_clear(&remote->negotiation_include, 0); + free(remote->follow_remote_head_raw); } static void add_merge(struct branch *branch, const char *name) @@ -581,30 +582,9 @@ static int handle_config(const char *key, const char *value, return parse_transport_option(key, value, &remote->negotiation_include); } else if (!strcmp(subkey, "followremotehead")) { - const char *no_warn_branch; - /* - * NEEDSWORK: this is validated/warned about here, during config - * parsing, regardless of whether the fetch that triggered this - * parse will ever consult it for this particular remote. See - * fetch.c's deferred handling of fetch.followRemoteHEAD for the - * pattern this should likely follow. - */ - if (!strcmp(value, "never")) - remote->follow_remote_head = FOLLOW_REMOTE_NEVER; - else if (!strcmp(value, "create")) - remote->follow_remote_head = FOLLOW_REMOTE_CREATE; - else if (!strcmp(value, "warn")) { - remote->follow_remote_head = FOLLOW_REMOTE_WARN; - remote->no_warn_branch = NULL; - } else if (skip_prefix(value, "warn-if-not-", &no_warn_branch)) { - remote->follow_remote_head = FOLLOW_REMOTE_WARN; - remote->no_warn_branch = no_warn_branch; - } else if (!strcmp(value, "always")) { - remote->follow_remote_head = FOLLOW_REMOTE_ALWAYS; - } else { - warning(_("unrecognized followRemoteHEAD value '%s' ignored"), - value); - } + free(remote->follow_remote_head_raw); + remote->follow_remote_head_raw = xstrdup_or_null(value); + remote->follow_remote_head_seen = 1; } return 0; } diff --git a/remote.h b/remote.h index cca02033b9..b95f00df2d 100644 --- a/remote.h +++ b/remote.h @@ -62,15 +62,6 @@ struct remote_state { void remote_state_clear(struct remote_state *remote_state); struct remote_state *remote_state_new(void); -#define BUILTIN_FOLLOW_REMOTE_HEAD_DFLT FOLLOW_REMOTE_CREATE -enum follow_remote_head_settings { - FOLLOW_REMOTE_UNCONFIGURED = 0, - FOLLOW_REMOTE_NEVER, - FOLLOW_REMOTE_CREATE, - FOLLOW_REMOTE_WARN, - FOLLOW_REMOTE_ALWAYS, -}; - struct remote { struct hashmap_entry ent; @@ -122,8 +113,8 @@ struct remote { struct string_list negotiation_restrict; struct string_list negotiation_include; - enum follow_remote_head_settings follow_remote_head; - const char *no_warn_branch; + char *follow_remote_head_raw; + int follow_remote_head_seen; }; /** diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh index 17c0be499c..5b97dced12 100755 --- a/t/t5510-fetch.sh +++ b/t/t5510-fetch.sh @@ -290,6 +290,24 @@ test_expect_success "fetch test followRemoteHEAD warn-if-not-branch branch is di test "z$head" = "z$branch" ' +test_expect_success "fetch test default followRemoteHEAD warn-if-not-branch is not supported" ' + git -C two rev-parse --verify refs/remotes/origin/other && + git -C two remote set-head origin other && + test_config -C two fetch.followRemoteHEAD "warn-if-not-main" && + git -C two fetch >out 2>err && + test_must_be_empty out && + test_grep "unrecognized fetch.followRemoteHEAD value ${SQ}warn-if-not-main${SQ} ignored" err && + echo refs/remotes/origin/other >expect && + git -C two symbolic-ref refs/remotes/origin/HEAD >actual && + test_cmp expect actual +' + +test_expect_success "fetch test followRemoteHEAD unrecognized value names the remote" ' + test_config -C two remote.origin.followRemoteHEAD bogus && + git -C two fetch 2>err && + test_grep "unrecognized remote.origin.followRemoteHEAD value ${SQ}bogus${SQ} ignored" err +' + test_expect_success "fetch test default followRemoteHEAD always" ' git -C two rev-parse --verify refs/remotes/origin/other && git -C two remote set-head origin other &&
-- 2.55.0.windows.3