{"thread":{"id":"52168","subject":"[PATCH 0/1] fetch.c: fix typo in a warning message","startedAt":"2019-10-31T20:41:51Z","lastAt":"2019-11-02T05:50:41Z","messageCount":5,"participants":["Ralf Thielow via GitGitGadget","Jonathan Nieder","Ralf Thielow","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":1},"messages":[{"id":"385240","messageId":"pull.441.git.1572554506.gitgitgadget@gmail.com","threadId":"52168","inReplyTo":null,"subject":"[PATCH 0/1] fetch.c: fix typo in a warning message","fromName":"Ralf Thielow via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-31T20:41:45Z","receivedAt":"2019-10-31T20:41:51Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Noticed this while reviewing German translation.\n\nCc: Matthias Rüster matthias.ruester@gmail.com [matthias.ruester@gmail.com]\n\nRalf Thielow (1):\n fetch.c: fix typo in a warning message\n\n builtin/fetch.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\n\nbase-commit: f21f8f5d35b09ecdd1a0112f114436fd2eda7df2\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-441%2Fralfth%2Ffetch-fix-warning-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-441/ralfth/fetch-fix-warning-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/441\n-- \ngitgitgadget\n"},{"id":"385241","messageId":"70f10fe44716e50765a9d8f7794116f390f09dbc.1572554506.git.gitgitgadget@gmail.com","threadId":"52168","inReplyTo":"pull.441.git.1572554506.gitgitgadget@gmail.com","subject":"[PATCH 1/1] fetch.c: fix typo in a warning message","fromName":"Ralf Thielow via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2019-10-31T20:41:46Z","receivedAt":"2019-10-31T20:41:52Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"From: Ralf Thielow \n\nSigned-off-by: Ralf Thielow \n---\n builtin/fetch.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 0c345b5dfe..f9a934f098 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport,\n \t\tfor (rm = ref_map; rm; rm = rm->next) {\n \t\t\tif (!rm->peer_ref) {\n \t\t\t\tif (source_ref) {\n-\t\t\t\t\twarning(_(\"multiple branch detected, incompatible with --set-upstream\"));\n+\t\t\t\t\twarning(_(\"multiple branches detected, incompatible with --set-upstream\"));\n \t\t\t\t\tgoto skip;\n \t\t\t\t} else {\n \t\t\t\t\tsource_ref = rm;\n-- \ngitgitgadget\n"},{"id":"385247","messageId":"20191031225310.GA211076@google.com","threadId":"52168","inReplyTo":"70f10fe44716e50765a9d8f7794116f390f09dbc.1572554506.git.gitgitgadget@gmail.com","subject":"Re: [PATCH 1/1] fetch.c: fix typo in a warning message","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2019-10-31T22:53:10Z","receivedAt":"2019-10-31T22:53:17Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Ralf Thielow wrote:\n\n> Signed-off-by: Ralf Thielow \n> ---\n> builtin/fetch.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nReviewed-by: Jonathan Nieder \n\n> Noticed this while reviewing German translation.\n\nThis kind of context tends to be useful in a commit message --- it\nhelps clarify the motivation behind the change.\n\n> diff --git a/builtin/fetch.c b/builtin/fetch.c\n> index 0c345b5dfe..f9a934f098 100644\n> --- a/builtin/fetch.c\n> +++ b/builtin/fetch.c\n> @@ -1411,7 +1411,7 @@ static int do_fetch(struct transport *transport,\n> \t\tfor (rm = ref_map; rm; rm = rm->next) {\n> \t\t\tif (!rm->peer_ref) {\n> \t\t\t\tif (source_ref) {\n> -\t\t\t\t\twarning(_(\"multiple branch detected, incompatible with --set-upstream\"));\n> +\t\t\t\t\twarning(_(\"multiple branches detected, incompatible with --set-upstream\"));\n\nLong line.\n\nI wonder what this warning is trying to say. How would I go about\ntriggering this message? The comment before says\n\n\tThe relevant upstream is the fetched branch that is meant to\n\tbe merged with the current one, i.e. the one fetched to\n\tFETCH_HEAD.\n\nSo is this about when I'm fetching with a wildcard or something?\n\nThanks,\nJonathan\n"},{"id":"385259","messageId":"CAN0XMOLDZo06Xa-Q9qVrVNk_J3+b2sP5e30f=_9s3nUw-B_JvQ@mail.gmail.com","threadId":"52168","inReplyTo":"20191031225310.GA211076@google.com","subject":"Re: [PATCH 1/1] fetch.c: fix typo in a warning message","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2019-11-01T09:48:44Z","receivedAt":"2019-11-01T09:49:23Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Am Do., 31. Okt. 2019 um 23:53 Uhr schrieb Jonathan Nieder :\n>\n> I wonder what this warning is trying to say. How would I go about\n> triggering this message? The comment before says\n>\n> The relevant upstream is the fetched branch that is meant to\n> be merged with the current one, i.e. the one fetched to\n> FETCH_HEAD.\n>\n> So is this about when I'm fetching with a wildcard or something?\n>\n\nThe message shows up when multiple refspecs/branches are passed,\nlike\n\n$ git fetch --set-upstream origin master next\nFrom https://github.com/git/git\n * branch master -> FETCH_HEAD\n * branch next -> FETCH_HEAD\nwarning: multiple branch detected, incompatible with --set-upstream\n"},{"id":"385302","messageId":"xmqqzhhe3jyr.fsf@gitster-ct.c.googlers.com","threadId":"52168","inReplyTo":"20191031225310.GA211076@google.com","subject":"Re: [PATCH 1/1] fetch.c: fix typo in a warning message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-11-02T05:50:36Z","receivedAt":"2019-11-02T05:50:41Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Ralf Thielow wrote:\n>\n>> Signed-off-by: Ralf Thielow \n>> ---\n>> builtin/fetch.c | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> Reviewed-by: Jonathan Nieder \n>> \t\t\t\tif (source_ref) {\n>> -\t\t\t\t\twarning(_(\"multiple branch detected, incompatible with --set-upstream\"));\n>> +\t\t\t\t\twarning(_(\"multiple branches detected, incompatible with --set-upstream\"));\n>\n> Long line.\n\n\nThanks, both. This close to the final, I am reluctant to touch any\nstring inside _(), so let's postpone it to the next cycle, though.\n"}]}