{"thread":{"id":"60107","subject":"[PATCH] builtin/worktree.c: Fix typo in \"forgot fetch\" msg","startedAt":"2023-08-11T23:40:12Z","lastAt":"2023-08-13T22:21:21Z","messageCount":2,"participants":["Jacob Abel","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"480606","messageId":"20230811233940.30264-1-jacobabel@nullpo.dev","threadId":"60107","inReplyTo":null,"subject":"[PATCH] builtin/worktree.c: Fix typo in \"forgot fetch\" msg","fromName":"Jacob Abel","fromEmail":"jacobabel@nullpo.dev","sentAt":"2023-08-11T23:39:51Z","receivedAt":"2023-08-11T23:40:12Z","isPatch":true,"sender":{"key":"jacobabel@nullpo.dev","avatar":"https://avatars.githubusercontent.com/u/9424043?v=4"},"body":"Replace misspelled word \"overide\" with correctly spelled \"override\".\n\nReported-By: Teng Long <dyroneteng@gmail.com>\nSigned-off-by: Jacob Abel <jacobabel@nullpo.dev>\n---\nThis patch fixes a typo identified in [1]. \n\nLuckily the text that contained this typo didn't interact with any other\nbehavior and the change didn't require any modifications to the test\ncode so it was a very quick, easy fix.\n\n1. https://lore.kernel.org/git/20230809064724.13032-1-tenglong.tl@alibaba-inc.com/\n\n builtin/worktree.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/worktree.c b/builtin/worktree.c\nindex 4cd01842de..10db70b7ec 100644\n--- a/builtin/worktree.c\n+++ b/builtin/worktree.c\n@@ -696,7 +696,7 @@ static int can_use_remote_refs(const struct add_opts *opts)\n \t\treturn 1;\n \t} else if (!opts->force && remote_get(NULL)) {\n \t\tdie(_(\"No local or remote refs exist despite at least one remote\\n\"\n-\t\t      \"present, stopping; use 'add -f' to overide or fetch a remote first\"));\n+\t\t      \"present, stopping; use 'add -f' to override or fetch a remote first\"));\n \t}\n \treturn 0;\n }\n\nbase-commit: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd\n-- \n2.41.0\n\n\n"},{"id":"480640","messageId":"xmqqttt2mvmu.fsf@gitster.g","threadId":"60107","inReplyTo":"20230811233940.30264-1-jacobabel@nullpo.dev","subject":"Re: [PATCH] builtin/worktree.c: Fix typo in \"forgot fetch\" msg","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-08-13T22:21:13Z","receivedAt":"2023-08-13T22:21:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jacob Abel <jacobabel@nullpo.dev> writes:\n\n> Replace misspelled word \"overide\" with correctly spelled \"override\".\n>\n> Reported-By: Teng Long <dyroneteng@gmail.com>\n> Signed-off-by: Jacob Abel <jacobabel@nullpo.dev>\n> ---\n> This patch fixes a typo identified in [1]. \n>\n> Luckily the text that contained this typo didn't interact with any other\n> behavior and the change didn't require any modifications to the test\n> code so it was a very quick, easy fix.\n\nTrue, but l10n folks need to be given sufficient time to react, so\nlet's postpone it til immediately after the upcoming release.\n\nThanks.\n\n> 1. https://lore.kernel.org/git/20230809064724.13032-1-tenglong.tl@alibaba-inc.com/\n>\n>  builtin/worktree.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/builtin/worktree.c b/builtin/worktree.c\n> index 4cd01842de..10db70b7ec 100644\n> --- a/builtin/worktree.c\n> +++ b/builtin/worktree.c\n> @@ -696,7 +696,7 @@ static int can_use_remote_refs(const struct add_opts *opts)\n>  \t\treturn 1;\n>  \t} else if (!opts->force && remote_get(NULL)) {\n>  \t\tdie(_(\"No local or remote refs exist despite at least one remote\\n\"\n> -\t\t      \"present, stopping; use 'add -f' to overide or fetch a remote first\"));\n> +\t\t      \"present, stopping; use 'add -f' to override or fetch a remote first\"));\n>  \t}\n>  \treturn 0;\n>  }\n>\n> base-commit: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd\n"}]}