# [PATCH] fetch: improve grammar of "shallow roots" message 6 messages from 2021-05-18 to 2021-05-20. Participants: Alex Henrie, Junio C Hamano, Derrick Stolee, Bagas Sanjaya. Thread: https://gitlist.dev/t/55716 ## Alex Henrie, 2021-05-18 06:18 Subject: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: <20210518061855.57478-1-alexhenrie24@gmail.com> URL: https://gitlist.dev/e/20210518061855.57478-1-alexhenrie24%40gmail.com ``` Signed-off-by: Alex Henrie --- builtin/fetch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.31.1 ``` ## Junio C Hamano, 2021-05-19 01:17 Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: URL: https://gitlist.dev/e/xmqq7djv1pzq.fsf%40gitster.g In-Reply-To: <20210518061855.57478-1-alexhenrie24@gmail.com> ``` Alex Henrie writes: > Signed-off-by: Alex Henrie > --- > 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; > } ``` ## Derrick Stolee, 2021-05-19 13:55 Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: <2b1985b6-c426-7f7a-2d6b-34977ddecc1d@gmail.com> URL: https://gitlist.dev/e/2b1985b6-c426-7f7a-2d6b-34977ddecc1d%40gmail.com In-Reply-To: <20210518061855.57478-1-alexhenrie24@gmail.com> ``` On 5/18/2021 2:18 AM, Alex Henrie wrote: > - warning(_("reject %s because shallow roots are not allowed to be updated"), > + warning(_("rejected %s because shallow roots are not allowed to be updated"), This change to past-tense makes sense to me. Thanks, -Stolee ``` ## Bagas Sanjaya, 2021-05-20 02:22 Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: <626174ae-ff25-8f07-4d67-705bbe3f7d68@gmail.com> URL: https://gitlist.dev/e/626174ae-ff25-8f07-4d67-705bbe3f7d68%40gmail.com In-Reply-To: <20210518061855.57478-1-alexhenrie24@gmail.com> ``` On 18/05/21 13.18, Alex Henrie wrote: > - warning(_("reject %s because shallow roots are not allowed to be updated"), > + warning(_("rejected %s because shallow roots are not allowed to be updated"), From descriptive to null-subject past tense, right? -- An old man doll... just what I always wanted! - Clara ``` ## Alex Henrie, 2021-05-20 04:02 Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: URL: https://gitlist.dev/e/CAMMLpeRxoakadrXUVGSkhP0K71GHXxt4sXvSKrB5rx8oFH60bw%40mail.gmail.com In-Reply-To: <626174ae-ff25-8f07-4d67-705bbe3f7d68@gmail.com> ``` On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya wrote: > > On 18/05/21 13.18, Alex Henrie wrote: > > > - warning(_("reject %s because shallow roots are not allowed to be updated"), > > + warning(_("rejected %s because shallow roots are not allowed to be updated"), > > From descriptive to null-subject past tense, right? I'm not sure what the best way is to describe the grammar here. I would say that the "ed" makes it clear that the message is a description of what did happen rather than an imperative command concerning what should happen. -Alex ``` ## Bagas Sanjaya, 2021-05-20 05:03 Subject: Re: [PATCH] fetch: improve grammar of "shallow roots" message Message-ID: <72f5226c-142a-f4a1-64c6-46ef647adbb5@gmail.com> URL: https://gitlist.dev/e/72f5226c-142a-f4a1-64c6-46ef647adbb5%40gmail.com In-Reply-To: ``` On 20/05/21 11.02, Alex Henrie wrote: > On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya wrote: >> >> On 18/05/21 13.18, Alex Henrie wrote: >> >>> - warning(_("reject %s because shallow roots are not allowed to be updated"), >>> + warning(_("rejected %s because shallow roots are not allowed to be updated"), >> >> From descriptive to null-subject past tense, right? > > I'm not sure what the best way is to describe the grammar here. I > would say that the "ed" makes it clear that the message is a > description of what did happen rather than an imperative command > concerning what should happen. > > -Alex > Looks OK. So the error had happened, and we needed to express the situation. Because it happened on the past, using past tense was obviously the right thing. Reviewed-by: Bagas Sanjaya -- An old man doll... just what I always wanted! - Clara ```