Re: RESEND [PATCH v10 7/8] worktree add: extend DWIM to infer --orphan
- From
Jacob Abel <jacobabel@nullpo.dev>
- Date
- Aug 11, 2023, 17:43 UTC
- Message-ID
- <6gxybfz4vu5onk6m7aqg2xuvlyipyp4dywujgjverfbeliw7pc@u4f5czxfl26s>
- In-Reply-To
- <20230809064724.13032-1-tenglong.tl@alibaba-inc.com>
On 23/08/09 02:47PM, Teng Long wrote:
Show 28 quoted lines
>
> > [...]
>
> s/overide/override?
>
> builtin/worktree.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 4cd01842..10db70b7 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;
> }
>
> ---
>
> I found it when working at l10n round of 2.42.0, maybe it's not late to fix
> this typo:
>
> Thanks.Ah yep. That's on me. I'll put together a patch of the above and send it out, cc-ing you before the end of the day today.