* [PATCH] fetch: improve grammar of "shallow roots" message
@ 2021-05-18 6:18 Alex Henrie
2021-05-19 1:17 ` Junio C Hamano
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Alex Henrie @ 2021-05-18 6:18 UTC (permalink / raw)
To: git, pclouds, gitster; +Cc: Alex Henrie
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] fetch: improve grammar of "shallow roots" message
2021-05-18 6:18 [PATCH] fetch: improve grammar of "shallow roots" message Alex Henrie
@ 2021-05-19 1:17 ` Junio C Hamano
2021-05-19 13:55 ` Derrick Stolee
2021-05-20 2:22 ` Bagas Sanjaya
2 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2021-05-19 1:17 UTC (permalink / raw)
To: Alex Henrie; +Cc: git, pclouds
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;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fetch: improve grammar of "shallow roots" message
2021-05-18 6:18 [PATCH] fetch: improve grammar of "shallow roots" message Alex Henrie
2021-05-19 1:17 ` Junio C Hamano
@ 2021-05-19 13:55 ` Derrick Stolee
2021-05-20 2:22 ` Bagas Sanjaya
2 siblings, 0 replies; 6+ messages in thread
From: Derrick Stolee @ 2021-05-19 13:55 UTC (permalink / raw)
To: Alex Henrie, git, pclouds, gitster
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fetch: improve grammar of "shallow roots" message
2021-05-18 6:18 [PATCH] fetch: improve grammar of "shallow roots" message Alex Henrie
2021-05-19 1:17 ` Junio C Hamano
2021-05-19 13:55 ` Derrick Stolee
@ 2021-05-20 2:22 ` Bagas Sanjaya
2021-05-20 4:02 ` Alex Henrie
2 siblings, 1 reply; 6+ messages in thread
From: Bagas Sanjaya @ 2021-05-20 2:22 UTC (permalink / raw)
To: Alex Henrie, git, pclouds, gitster
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fetch: improve grammar of "shallow roots" message
2021-05-20 2:22 ` Bagas Sanjaya
@ 2021-05-20 4:02 ` Alex Henrie
2021-05-20 5:03 ` Bagas Sanjaya
0 siblings, 1 reply; 6+ messages in thread
From: Alex Henrie @ 2021-05-20 4:02 UTC (permalink / raw)
To: Bagas Sanjaya
Cc: Git mailing list, Nguyễn Thái Ngọc Duy,
Junio C Hamano
On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya <bagasdotme@gmail.com> 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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] fetch: improve grammar of "shallow roots" message
2021-05-20 4:02 ` Alex Henrie
@ 2021-05-20 5:03 ` Bagas Sanjaya
0 siblings, 0 replies; 6+ messages in thread
From: Bagas Sanjaya @ 2021-05-20 5:03 UTC (permalink / raw)
To: Alex Henrie
Cc: Git mailing list, Nguyễn Thái Ngọc Duy,
Junio C Hamano
On 20/05/21 11.02, Alex Henrie wrote:
> On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya <bagasdotme@gmail.com> 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 <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-20 5:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-18 6:18 [PATCH] fetch: improve grammar of "shallow roots" message Alex Henrie
2021-05-19 1:17 ` Junio C Hamano
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
Code repositories for project(s) associated with this public 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).