summaryrefslogtreecommitdiffstats
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-01-06 21:02:21 +0100
committerJunio C Hamano <gitster@pobox.com>2025-01-06 21:02:21 +0100
commita41e394e21eff277e77d3b14b451271f75caa812 (patch)
treeb540c763385aae5fb28f2e49cd7e5a721ad3c9ac /builtin
parentGit 2.48-rc2 (diff)
parentfetch: fix erroneous set_head advice message (diff)
downloadgit-a41e394e21eff277e77d3b14b451271f75caa812.tar.xz
git-a41e394e21eff277e77d3b14b451271f75caa812.zip
Merge branch 'bf/fetch-set-head-config'
A hotfix on an advice messagge added during this cycle. * bf/fetch-set-head-config: fetch: fix erroneous set_head advice message
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 2d37a378ba..fe2b26c74a 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -1588,8 +1588,8 @@ static void set_head_advice_msg(const char *remote, const char *head_name)
N_("Run 'git remote set-head %s %s' to follow the change, or set\n"
"'remote.%s.followRemoteHEAD' configuration option to a different value\n"
"if you do not want to see this message. Specifically running\n"
- "'git config set remote.%s.followRemoteHEAD %s' will disable the warning\n"
- "until the remote changes HEAD to something else.");
+ "'git config set remote.%s.followRemoteHEAD warn-if-not-branch-%s'\n"
+ "will disable the warning until the remote changes HEAD to something else.");
advise_if_enabled(ADVICE_FETCH_SET_HEAD_WARN, _(message_advice_set_head),
remote, head_name, remote, remote, head_name);