{"thread":{"id":"58017","subject":"[PATCH] push: fix capitalisation of the option name autoSetupMerge","startedAt":"2022-06-15T15:35:51Z","lastAt":"2022-06-15T18:48:01Z","messageCount":2,"participants":["Fangyi Zhou via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"457287","messageId":"pull.1276.git.git.1655307345132.gitgitgadget@gmail.com","threadId":"58017","inReplyTo":null,"subject":"[PATCH] push: fix capitalisation of the option name autoSetupMerge","fromName":"Fangyi Zhou via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2022-06-15T15:35:44Z","receivedAt":"2022-06-15T15:35:51Z","isPatch":true,"sender":{"key":"me@fangyi.io","avatar":"https://avatars.githubusercontent.com/u/7815439?v=4"},"body":"From: Fangyi Zhou <me@fangyi.io>\n\nThis was found during l10n process by Jiang Xin.\n\nReported-by: Jiang Xin <worldhello.net@gmail.com>\nSigned-off-by: Fangyi Zhou <me@fangyi.io>\n---\n    push: Fix capitalisation of the option name autoSetupMerge\n    \n    This was found during l10n process by Jiang Xin.\n    \n    Signed-off-by: Fangyi Zhou me@fangyi.io\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1276%2Ffangyi-zhou%2Fautosetupmerge-capitalisation-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1276/fangyi-zhou/autosetupmerge-capitalisation-v1\nPull-Request: https://github.com/git/git/pull/1276\n\n builtin/push.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/push.c b/builtin/push.c\nindex 86b44f8aa71..df0d68e5998 100644\n--- a/builtin/push.c\n+++ b/builtin/push.c\n@@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,\n \t\t\t\t \"To avoid automatically configuring \"\n \t\t\t\t \"upstream branches when their name\\n\"\n \t\t\t\t \"doesn't match the local branch, see option \"\n-\t\t\t\t \"'simple' of branch.autosetupmerge\\n\"\n+\t\t\t\t \"'simple' of branch.autoSetupMerge\\n\"\n \t\t\t\t \"in 'git help config'.\\n\");\n \tdie(_(\"The upstream branch of your current branch does not match\\n\"\n \t      \"the name of your current branch.  To push to the upstream branch\\n\"\n\nbase-commit: 8168d5e9c23ed44ae3d604f392320d66556453c9\n-- \ngitgitgadget\n"},{"id":"457305","messageId":"xmqqtu8lzrtu.fsf@gitster.g","threadId":"58017","inReplyTo":"pull.1276.git.git.1655307345132.gitgitgadget@gmail.com","subject":"Re: [PATCH] push: fix capitalisation of the option name autoSetupMerge","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2022-06-15T18:47:57Z","receivedAt":"2022-06-15T18:48:01Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Fangyi Zhou via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> From: Fangyi Zhou <me@fangyi.io>\n>\n> This was found during l10n process by Jiang Xin.\n> ...\n> @@ -171,7 +171,7 @@ static NORETURN void die_push_simple(struct branch *branch,\n>  \t\t\t\t \"To avoid automatically configuring \"\n>  \t\t\t\t \"upstream branches when their name\\n\"\n>  \t\t\t\t \"doesn't match the local branch, see option \"\n> -\t\t\t\t \"'simple' of branch.autosetupmerge\\n\"\n> +\t\t\t\t \"'simple' of branch.autoSetupMerge\\n\"\n>  \t\t\t\t \"in 'git help config'.\\n\");\n>  \tdie(_(\"The upstream branch of your current branch does not match\\n\"\n>  \t      \"the name of your current branch.  To push to the upstream branch\\n\"\n\nAs this affects translation, I'll fast-track and apply the patch\ndirectly on 'master', as the underlying topic that brought in this\nstring is a new feature that will never be merged down to \nmaintenance tracks.\n\nThanks.\n"}]}