git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Abel <jacobabel@nullpo.dev>
Cc: git@vger.kernel.org, Teng Long <dyroneteng@gmail.com>
Subject: Re: [PATCH] builtin/worktree.c: Fix typo in "forgot fetch" msg
Date: Sun, 13 Aug 2023 15:21:13 -0700	[thread overview]
Message-ID: <xmqqttt2mvmu.fsf@gitster.g> (raw)
In-Reply-To: <20230811233940.30264-1-jacobabel@nullpo.dev> (Jacob Abel's message of "Fri, 11 Aug 2023 23:39:51 +0000")

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

      reply	other threads:[~2023-08-13 22:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqttt2mvmu.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=dyroneteng@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jacobabel@nullpo.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).