{"thread":{"id":"60401","subject":"[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","startedAt":"2023-10-19T12:24:42Z","lastAt":"2023-10-21T17:27:06Z","messageCount":9,"participants":["王常新","Junio C Hamano","Bagas Sanjaya"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"483484","messageId":"2DB9ED79-FE58-4072-91E0-B4C51A3F6C5B@gmail.com","threadId":"60401","inReplyTo":null,"subject":"[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"王常新","fromEmail":"wchangxin824@gmail.com","sentAt":"2023-10-19T12:24:24Z","receivedAt":"2023-10-19T12:24:42Z","isPatch":true,"sender":{"key":"wchangxin824@gmail.com","avatar":"https://avatars.githubusercontent.com/u/222921233?v=4"},"body":"From: foril <1571825323@qq.com>\n\nSigned-off-by: 王常新 (Wang Changxin) \n---\n typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…\n\n the comments on line 2039 under merge-ort.c should be :\n this is needed if we have content merges of content merges rather than\n this is neeed if we have content merges of content merges\n\n fix the typo\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v1\nPull-Request: https://github.com/git/git/pull/1592\n\nmerge-ort.c | 2 +-\n1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/merge-ort.c b/merge-ort.c\nindex 7857ce9fbd1..aee6f7d8173 100644\n--- a/merge-ort.c\n+++ b/merge-ort.c\n@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,\n\t * the three blobs to merge on various sides of history.\n\t *\n\t * extra_marker_size is the amount to extend conflict markers in\n-\t * ll_merge; this is neeed if we have content merges of content\n+\t * ll_merge; this is needed if we have content merges of content\n\t * merges, which happens for example with rename/rename(2to1) and\n\t * rename/add conflicts.\n\t */\n\nbase-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed\n-- \ngitgitgadget\n\n"},{"id":"483497","messageId":"xmqq5y32zgnk.fsf@gitster.g","threadId":"60401","inReplyTo":"2DB9ED79-FE58-4072-91E0-B4C51A3F6C5B@gmail.com","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-19T17:05:51Z","receivedAt":"2023-10-19T17:06:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"王常新 writes:\n\n> From: foril <1571825323@qq.com>\n>\n> Signed-off-by: 王常新 (Wang Changxin) \n> ---\n\nThanks. \n\nWe want to make sure that the \"Name \" on the From:\nand Signed-off-by: lines match. Is your official name/address the\none on the Singed-off-by: line?\n"},{"id":"483537","messageId":"42D0A6FD-1314-4977-92E6-BF6535D82E8A@gmail.com","threadId":"60401","inReplyTo":"xmqq5y32zgnk.fsf@gitster.g","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"王常新","fromEmail":"wchangxin824@gmail.com","sentAt":"2023-10-20T02:14:51Z","receivedAt":"2023-10-20T02:15:07Z","isPatch":true,"sender":{"key":"wchangxin824@gmail.com","avatar":"https://avatars.githubusercontent.com/u/222921233?v=4"},"body":"It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n\nBest regards\n\n> 2023年10月20日 01:05，Junio C Hamano 写道：\n> \n> 王常新 writes:\n> \n>> From: foril <1571825323@qq.com>\n>> \n>> Signed-off-by: 王常新 (Wang Changxin) \n>> ---\n> \n> Thanks. \n> \n> We want to make sure that the \"Name \" on the From:\n> and Signed-off-by: lines match. Is your official name/address the\n> one on the Singed-off-by: line?\n> \n\n"},{"id":"483546","messageId":"facb06e0-9ad7-40eb-83e3-0a951931496d@gmail.com","threadId":"60401","inReplyTo":"42D0A6FD-1314-4977-92E6-BF6535D82E8A@gmail.com","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2023-10-20T07:41:17Z","receivedAt":"2023-10-20T07:41:30Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 20/10/2023 09:14, 王常新 wrote:\n> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n> \n\nPlease don't top-post, reply inline with appropriate context instead.\n\nDid you mean that you can't receive ML traffic on your @qq.com address?\nIf so, resend with your @gmail.com address as patch author (you need\nto set user.name and user.email accordingly). \n\nThanks.\n\n-- \nAn old man doll... just what I always wanted! - Clara\n\n"},{"id":"483569","messageId":"xmqqv8b1s0pf.fsf@gitster.g","threadId":"60401","inReplyTo":"42D0A6FD-1314-4977-92E6-BF6535D82E8A@gmail.com","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-20T16:44:28Z","receivedAt":"2023-10-20T16:44:35Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"王常新 writes:\n\n> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n\nWe try to keep the name and address on Signed-off-by: the official\none that we can give court if/when some copyright troll sues us (see\nDocumentation/SubmittingPatches:sign-off), and one of them (if more\nthan one developers signed off the patch) must match the primary\nauthor's name and address.\n\nThanks.\n"},{"id":"483574","messageId":"xmqqfs25rzo1.fsf@gitster.g","threadId":"60401","inReplyTo":"facb06e0-9ad7-40eb-83e3-0a951931496d@gmail.com","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-20T17:06:54Z","receivedAt":"2023-10-20T17:07:02Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Bagas Sanjaya writes:\n\n> On 20/10/2023 09:14, 王常新 wrote:\n>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n>> \n>\n> Please don't top-post, reply inline with appropriate context instead.\n>\n> Did you mean that you can't receive ML traffic on your @qq.com address?\n> If so, resend with your @gmail.com address as patch author (you need\n> to set user.name and user.email accordingly). \n\nIsn't that opposite from what we would normally recommend, though?\n\nIf the true authorship e-mail is in an environment where sending\npatches are inconvenient, you would still want to do your commits\nunder the identity you want to appear in the final history of the\nproject, so you do not futz with user.name and user.email; you'd\nsend a message with in-body header that shows an extra From: line\n(followed by a blank line) that records the true authorship from an\nenvironment whose sender e-mail address may differ.\n\nE.g. You would see these fields in the e-mail heeader:\n\n\tFrom: 王常新 \n\tSubject: [PATCH] merge-ort.c: comment typofix\n\nand your message would begin like so (indented only for illustration\npurposes---the real one should be flushed to the left edge of the\npage):\n\n\tFrom: 王常新 \n\n\tThere is 'needed' misspelt as 'neeed' in the source file;\n\tfix it.\n\n\tSigned-off-by: 王常新 \n\nThis feature is designed so that other people, different from the\nauthor of the patch, can relay it to the recipient(s) while\npreserving the authorship information.\n\nAlthough it is not needed in this case, you can override \"Subject:\"\nthe same way with an in-body header, like so:\n\n\tFrom: 王常新 \n\tSubject: real title of the patch to be used\n\n\tThere is 'needed' misspelt as 'neeed' in the source file;\n\tfix it.\n\n\tSigned-off-by: 王常新 \n\nand it would replace what we read from the Subject: e-mail header.\n"},{"id":"483614","messageId":"DE904895-230C-436E-B7DE-499E6E503DB9@gmail.com","threadId":"60401","inReplyTo":"xmqqv8b1s0pf.fsf@gitster.g","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"王常新","fromEmail":"wchangxin824@gmail.com","sentAt":"2023-10-21T01:22:36Z","receivedAt":"2023-10-21T01:22:56Z","isPatch":true,"sender":{"key":"wchangxin824@gmail.com","avatar":"https://avatars.githubusercontent.com/u/222921233?v=4"},"body":"\n\n> 2023年10月21日 00:44，Junio C Hamano 写道：\n> \n> 王常新 writes:\n> \n>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n> \n> We try to keep the name and address on Signed-off-by: the official\n> one that we can give court if/when some copyright troll sues us (see\n> Documentation/SubmittingPatches:sign-off), and one of them (if more\n> than one developers signed off the patch) must match the primary\n> author's name and address.\n> \n> Thanks.\n\nSorry about that, I am not quite familiar with the process. I mean I can receive emails at both @qq.com and @gmail.com, but in the signed-off-by trailer in the commit message doesn’t actually exist. \n\nGiven this situation, I am unsure of the next steps to correct this issue. Would it be appropriate for me to use 'rebase -i' to amend the erroneous commit message, followed by a force push to update the PR on GitHub? After this, is the correct following step to add another comment with \"/submit\" to finalize the changes?\n\nSincerely apologize for any inconvenience my mistake may have caused and appreciate your guidance on resolving this matter. Your patience and support in this learning process mean a lot to me.\n\n"},{"id":"483617","messageId":"1df77452-2355-400c-adbb-a04b2bc32602@gmail.com","threadId":"60401","inReplyTo":"xmqqfs25rzo1.fsf@gitster.g","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2023-10-21T08:12:19Z","receivedAt":"2023-10-21T08:12:31Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"On 21/10/2023 00:06, Junio C Hamano wrote:\n> Bagas Sanjaya writes:\n> \n>> On 20/10/2023 09:14, 王常新 wrote:\n>>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?\n>>>\n>>\n>> Please don't top-post, reply inline with appropriate context instead.\n>>\n>> Did you mean that you can't receive ML traffic on your @qq.com address?\n>> If so, resend with your @gmail.com address as patch author (you need\n>> to set user.name and user.email accordingly). \n> \n> Isn't that opposite from what we would normally recommend, though?\n> \n> If the true authorship e-mail is in an environment where sending\n> patches are inconvenient, you would still want to do your commits\n> under the identity you want to appear in the final history of the\n> project, so you do not futz with user.name and user.email; you'd\n> send a message with in-body header that shows an extra From: line\n> (followed by a blank line) that records the true authorship from an\n> environment whose sender e-mail address may differ.\n> \n> E.g. You would see these fields in the e-mail heeader:\n> \n> \tFrom: 王常新 \n> \tSubject: [PATCH] merge-ort.c: comment typofix\n> \n> and your message would begin like so (indented only for illustration\n> purposes---the real one should be flushed to the left edge of the\n> page):\n> \n> \tFrom: 王常新 \n> \n> \tThere is 'needed' misspelt as 'neeed' in the source file;\n> \tfix it.\n> \n> \tSigned-off-by: 王常新 \n> \n> This feature is designed so that other people, different from the\n> author of the patch, can relay it to the recipient(s) while\n> preserving the authorship information.\n> \n> Although it is not needed in this case, you can override \"Subject:\"\n> the same way with an in-body header, like so:\n> \n> \tFrom: 王常新 \n> \tSubject: real title of the patch to be used\n> \n> \tThere is 'needed' misspelt as 'neeed' in the source file;\n> \tfix it.\n> \n> \tSigned-off-by: 王常新 \n> \n> and it would replace what we read from the Subject: e-mail header.\n\nThanks for the explanation! I was confused then...\n\n-- \nAn old man doll... just what I always wanted! - Clara\n\n"},{"id":"483621","messageId":"xmqqa5sbubs0.fsf@gitster.g","threadId":"60401","inReplyTo":"DE904895-230C-436E-B7DE-499E6E503DB9@gmail.com","subject":"Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2023-10-21T17:26:55Z","receivedAt":"2023-10-21T17:27:06Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"王常新 writes:\n\n> Sorry about that, I am not quite familiar with the process. I mean\n> I can receive emails at both @qq.com and @gmail.com, but\n> in the signed-off-by trailer in the commit\n> message doesn’t actually exist.\n\nI cannot tell you which between these two to use, as I do not know\nyour situation. When a contributor works on Git and send a patch as\nan employee of a company, sometimes the employer wants to see their\nname prominently shown in the commit, and that is why we see commits\nby folks working on Git for GitHub for example with their\n@GitHub.com addresses, even though they may have personal addresses\nat @gmail.com. When a contribution is made as a hobbist (which I\nwas back when I started contributing to this project), people seem\nto prefer using their personal address over using their work\naddress, so that the name and address recorded in the commit will\nstay with them even when they move on.\n\nWhatever name and address you choose, if you are using GGG, you'd\nneed to update your commits locally, perhaps like so:\n\n $ git commit --amend --author=\"Name \"\n\n(and in the editor you have a chance to make sure your sign-off\nmatches the authorship).\n\nAfter that I would suppose that you force push the result to update\nyour pull-request and /submit again (I am not a user of GGG, so I\nmay have got the details wrong).\n\nThanks.\n"}]}