Re: [PATCH] fetch: improve grammar of "shallow roots" message

From: Junio C Hamano <gitster@pobox.com>
Date: May 19, 2021, 01:17 UTC
Message-ID: <xmqq7djv1pzq.fsf@gitster.g>
In-Reply-To: <20210518061855.57478-1-alexhenrie24@gmail.com>

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.

Show 13 quoted lines

> 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;
>  			}