# [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg 2 messages from 2023-08-11 to 2023-08-13. Participants: Jacob Abel, Junio C Hamano. Thread: https://gitlist.dev/t/60107 ## Jacob Abel, 2023-08-11 23:39 Subject: [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg Message-ID: <20230811233940.30264-1-jacobabel@nullpo.dev> URL: https://gitlist.dev/e/20230811233940.30264-1-jacobabel%40nullpo.dev ``` Replace misspelled word "overide" with correctly spelled "override". Reported-By: Teng Long Signed-off-by: Jacob Abel --- This patch fixes a typo identified in [1]. Luckily the text that contained this typo didn't interact with any other behavior and the change didn't require any modifications to the test code so it was a very quick, easy fix. 1. https://lore.kernel.org/git/20230809064724.13032-1-tenglong.tl@alibaba-inc.com/ builtin/worktree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 4cd01842de..10db70b7ec 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -696,7 +696,7 @@ static int can_use_remote_refs(const struct add_opts *opts) return 1; } else if (!opts->force && remote_get(NULL)) { die(_("No local or remote refs exist despite at least one remote\n" - "present, stopping; use 'add -f' to overide or fetch a remote first")); + "present, stopping; use 'add -f' to override or fetch a remote first")); } return 0; } base-commit: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd -- 2.41.0 ``` ## Junio C Hamano, 2023-08-13 22:21 Subject: Re: [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg Message-ID: URL: https://gitlist.dev/e/xmqqttt2mvmu.fsf%40gitster.g In-Reply-To: <20230811233940.30264-1-jacobabel@nullpo.dev> ``` Jacob Abel writes: > Replace misspelled word "overide" with correctly spelled "override". > > Reported-By: Teng Long > Signed-off-by: Jacob Abel > --- > This patch fixes a typo identified in [1]. > > Luckily the text that contained this typo didn't interact with any other > behavior and the change didn't require any modifications to the test > code so it was a very quick, easy fix. True, but l10n folks need to be given sufficient time to react, so let's postpone it til immediately after the upcoming release. Thanks. > 1. https://lore.kernel.org/git/20230809064724.13032-1-tenglong.tl@alibaba-inc.com/ > > builtin/worktree.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/builtin/worktree.c b/builtin/worktree.c > index 4cd01842de..10db70b7ec 100644 > --- a/builtin/worktree.c > +++ b/builtin/worktree.c > @@ -696,7 +696,7 @@ static int can_use_remote_refs(const struct add_opts *opts) > return 1; > } else if (!opts->force && remote_get(NULL)) { > die(_("No local or remote refs exist despite at least one remote\n" > - "present, stopping; use 'add -f' to overide or fetch a remote first")); > + "present, stopping; use 'add -f' to override or fetch a remote first")); > } > return 0; > } > > base-commit: fac96dfbb1c24369ba7d37a5affd8adfe6c650fd ```