git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, pclouds@gmail.com
Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message
Date: Wed, 19 May 2021 10:17:29 +0900	[thread overview]
Message-ID: <xmqq7djv1pzq.fsf@gitster.g> (raw)
In-Reply-To: <20210518061855.57478-1-alexhenrie24@gmail.com> (Alex Henrie's message of "Tue, 18 May 2021 00:18:55 -0600")

Alex Henrie <alexhenrie24@gmail.com> writes:

> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/fetch.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

This and the other one on setup.c both look good changes, but it's
not like these messages are new breakages in the upcoming release
whose -rc0 has already been tagged and call for help to translators
has been issued, on which presumably translators are already
working.

So please hold onto these patches until final; I might pick them up
and keep them in 'seen' but I may not, and I do not want to see them
lost.

Thanks.

> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 97c4fe6e6d..c19a041526 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -1123,7 +1123,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
>  
>  			if (rm->status == REF_STATUS_REJECT_SHALLOW) {
>  				if (want_status == FETCH_HEAD_MERGE)
> -					warning(_("reject %s because shallow roots are not allowed to be updated"),
> +					warning(_("rejected %s because shallow roots are not allowed to be updated"),
>  						rm->peer_ref ? rm->peer_ref->name : rm->name);
>  				continue;
>  			}

  reply	other threads:[~2021-05-19  1:17 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-18  6:18 Alex Henrie
2021-05-19  1:17 ` Junio C Hamano [this message]
2021-05-19 13:55 ` Derrick Stolee
2021-05-20  2:22 ` Bagas Sanjaya
2021-05-20  4:02   ` Alex Henrie
2021-05-20  5:03     ` Bagas Sanjaya

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=xmqq7djv1pzq.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=alexhenrie24@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    /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.
Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

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).