* [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg
@ 2023-08-11 23:39 Jacob Abel
2023-08-13 22:21 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Jacob Abel @ 2023-08-11 23:39 UTC (permalink / raw
To: git; +Cc: Jacob Abel, Teng Long
Replace misspelled word "overide" with correctly spelled "override".
Reported-By: Teng Long <dyroneteng@gmail.com>
Signed-off-by: Jacob Abel <jacobabel@nullpo.dev>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg
2023-08-11 23:39 [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg Jacob Abel
@ 2023-08-13 22:21 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2023-08-13 22:21 UTC (permalink / raw
To: Jacob Abel; +Cc: git, Teng Long
Jacob Abel <jacobabel@nullpo.dev> writes:
> Replace misspelled word "overide" with correctly spelled "override".
>
> Reported-By: Teng Long <dyroneteng@gmail.com>
> Signed-off-by: Jacob Abel <jacobabel@nullpo.dev>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-13 22:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-11 23:39 [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg Jacob Abel
2023-08-13 22:21 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).