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

Signed-off-by: Alex Henrie <redacted>
---
 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

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

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

On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya [off-list ref] wrote:

On 18/05/21 13.18, Alex Henrie wrote:

quoted

-                                     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

On 20/05/21 11.02, Alex Henrie wrote:

On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya [off-list ref] wrote:

quoted

On 18/05/21 13.18, Alex Henrie wrote:

quoted

-                                     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 <redacted>

-- 
An old man doll... just what I always wanted! - Clara