{"thread":{"id":"55716","subject":"[PATCH] fetch: improve grammar of \"shallow roots\" message","startedAt":"2021-05-18T06:19:03Z","lastAt":"2021-05-20T05:03:42Z","messageCount":6,"participants":["Alex Henrie","Junio C Hamano","Derrick Stolee","Bagas Sanjaya"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"424827","messageId":"20210518061855.57478-1-alexhenrie24@gmail.com","threadId":"55716","inReplyTo":null,"subject":"[PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2021-05-18T06:18:55Z","receivedAt":"2021-05-18T06:19:03Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"Signed-off-by: Alex Henrie \n---\n builtin/fetch.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/fetch.c b/builtin/fetch.c\nindex 97c4fe6e6d..c19a041526 100644\n--- a/builtin/fetch.c\n+++ b/builtin/fetch.c\n@@ -1123,7 +1123,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,\n \n \t\t\tif (rm->status == REF_STATUS_REJECT_SHALLOW) {\n \t\t\t\tif (want_status == FETCH_HEAD_MERGE)\n-\t\t\t\t\twarning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n+\t\t\t\t\twarning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n \t\t\t\t\t\trm->peer_ref ? rm->peer_ref->name : rm->name);\n \t\t\t\tcontinue;\n \t\t\t}\n-- \n2.31.1\n\n"},{"id":"424910","messageId":"xmqq7djv1pzq.fsf@gitster.g","threadId":"55716","inReplyTo":"20210518061855.57478-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-05-19T01:17:29Z","receivedAt":"2021-05-19T01:17:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Alex Henrie writes:\n\n> Signed-off-by: Alex Henrie \n> ---\n> builtin/fetch.c | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n\nThis and the other one on setup.c both look good changes, but it's\nnot like these messages are new breakages in the upcoming release\nwhose -rc0 has already been tagged and call for help to translators\nhas been issued, on which presumably translators are already\nworking.\n\nSo please hold onto these patches until final; I might pick them up\nand keep them in 'seen' but I may not, and I do not want to see them\nlost.\n\nThanks.\n\n> diff --git a/builtin/fetch.c b/builtin/fetch.c\n> index 97c4fe6e6d..c19a041526 100644\n> --- a/builtin/fetch.c\n> +++ b/builtin/fetch.c\n> @@ -1123,7 +1123,7 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,\n> \n> \t\t\tif (rm->status == REF_STATUS_REJECT_SHALLOW) {\n> \t\t\t\tif (want_status == FETCH_HEAD_MERGE)\n> -\t\t\t\t\twarning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n> +\t\t\t\t\twarning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n> \t\t\t\t\t\trm->peer_ref ? rm->peer_ref->name : rm->name);\n> \t\t\t\tcontinue;\n> \t\t\t}\n"},{"id":"424959","messageId":"2b1985b6-c426-7f7a-2d6b-34977ddecc1d@gmail.com","threadId":"55716","inReplyTo":"20210518061855.57478-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2021-05-19T13:55:40Z","receivedAt":"2021-05-19T13:55:45Z","isPatch":true,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 5/18/2021 2:18 AM, Alex Henrie wrote:\n> - warning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n> + warning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n\nThis change to past-tense makes sense to me.\n\nThanks,\n-Stolee\n"},{"id":"425018","messageId":"626174ae-ff25-8f07-4d67-705bbe3f7d68@gmail.com","threadId":"55716","inReplyTo":"20210518061855.57478-1-alexhenrie24@gmail.com","subject":"Re: [PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-05-20T02:22:17Z","receivedAt":"2021-05-20T02:22:35Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 18/05/21 13.18, Alex Henrie wrote:\n\n> -\t\t\t\t\twarning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n> +\t\t\t\t\twarning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n\n From descriptive to null-subject past tense, right?\n\n-- \nAn old man doll... just what I always wanted! - Clara\n"},{"id":"425029","messageId":"CAMMLpeRxoakadrXUVGSkhP0K71GHXxt4sXvSKrB5rx8oFH60bw@mail.gmail.com","threadId":"55716","inReplyTo":"626174ae-ff25-8f07-4d67-705bbe3f7d68@gmail.com","subject":"Re: [PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Alex Henrie","fromEmail":"alexhenrie24@gmail.com","sentAt":"2021-05-20T04:02:24Z","receivedAt":"2021-05-20T04:02:38Z","isPatch":true,"sender":{"key":"alexhenrie24@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5951993?v=4"},"body":"On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya wrote:\n>\n> On 18/05/21 13.18, Alex Henrie wrote:\n>\n> > - warning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n> > + warning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n>\n> From descriptive to null-subject past tense, right?\n\nI'm not sure what the best way is to describe the grammar here. I\nwould say that the \"ed\" makes it clear that the message is a\ndescription of what did happen rather than an imperative command\nconcerning what should happen.\n\n-Alex\n"},{"id":"425034","messageId":"72f5226c-142a-f4a1-64c6-46ef647adbb5@gmail.com","threadId":"55716","inReplyTo":"CAMMLpeRxoakadrXUVGSkhP0K71GHXxt4sXvSKrB5rx8oFH60bw@mail.gmail.com","subject":"Re: [PATCH] fetch: improve grammar of \"shallow roots\" message","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-05-20T05:03:36Z","receivedAt":"2021-05-20T05:03:42Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 20/05/21 11.02, Alex Henrie wrote:\n> On Wed, May 19, 2021 at 8:22 PM Bagas Sanjaya wrote:\n>>\n>> On 18/05/21 13.18, Alex Henrie wrote:\n>>\n>>> - warning(_(\"reject %s because shallow roots are not allowed to be updated\"),\n>>> + warning(_(\"rejected %s because shallow roots are not allowed to be updated\"),\n>>\n>> From descriptive to null-subject past tense, right?\n> \n> I'm not sure what the best way is to describe the grammar here. I\n> would say that the \"ed\" makes it clear that the message is a\n> description of what did happen rather than an imperative command\n> concerning what should happen.\n> \n> -Alex\n> \n\nLooks OK.\n\nSo the error had happened, and we needed to express the situation.\nBecause it happened on the past, using past tense was obviously the\nright thing.\n\nReviewed-by: Bagas Sanjaya \n\n-- \nAn old man doll... just what I always wanted! - Clara\n"}]}