[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[王常新]

From: foril <1571825323@qq.com>

Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
---
   typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…

   the comments on line 2039 under merge-ort.c should be :
   this is needed if we have content merges of content merges rather than
   this is neeed if we have content merges of content merges

   fix the typo

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v1
Pull-Request: https://github.com/git/git/pull/1592

merge-ort.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-ort.c b/merge-ort.c
index 7857ce9fbd1..aee6f7d8173 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,
	 * the three blobs to merge on various sides of history.
	 *
	 * extra_marker_size is the amount to extend conflict markers in
-	 * ll_merge; this is neeed if we have content merges of content
+	 * ll_merge; this is needed if we have content merges of content
	 * merges, which happens for example with rename/rename(2to1) and
	 * rename/add conflicts.
	 */

base-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed
-- 
gitgitgadget

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Junio C Hamano]

王常新 <wchangxin824@gmail.com> writes:

> From: foril <1571825323@qq.com>
>
> Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
> ---

Thanks.  

We want to make sure that the "Name <e-mail-address>" on the From:
and Signed-off-by: lines match.  Is your official name/address the
one on the Singed-off-by: line?

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[王常新]

It is my official name. But the email address is not a valid one. Should I rewrite the commit message?

Best regards

> 2023年10月20日 01:05，Junio C Hamano <gitster@pobox.com> 写道：
> 
> 王常新 <wchangxin824@gmail.com> writes:
> 
>> From: foril <1571825323@qq.com>
>> 
>> Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
>> ---
> 
> Thanks.  
> 
> We want to make sure that the "Name <e-mail-address>" on the From:
> and Signed-off-by: lines match.  Is your official name/address the
> one on the Singed-off-by: line?
> 

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Bagas Sanjaya]

On 20/10/2023 09:14, 王常新 wrote:
> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?
> 

Please don't top-post, reply inline with appropriate context instead.

Did you mean that you can't receive ML traffic on your @qq.com address?
If so, resend with your @gmail.com address as patch author (you need
to set user.name and user.email accordingly). 

Thanks.

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

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Junio C Hamano]

Bagas Sanjaya <bagasdotme@gmail.com> writes:

> On 20/10/2023 09:14, 王常新 wrote:
>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?
>> 
>
> Please don't top-post, reply inline with appropriate context instead.
>
> Did you mean that you can't receive ML traffic on your @qq.com address?
> If so, resend with your @gmail.com address as patch author (you need
> to set user.name and user.email accordingly). 

Isn't that opposite from what we would normally recommend, though?

If the true authorship e-mail is in an environment where sending
patches are inconvenient, you would still want to do your commits
under the identity you want to appear in the final history of the
project, so you do not futz with user.name and user.email; you'd
send a message with in-body header that shows an extra From: line
(followed by a blank line) that records the true authorship from an
environment whose sender e-mail address may differ.

E.g.  You would see these fields in the e-mail heeader:

	From: 王常新 <wchangxin824@gmail.com>
	Subject: [PATCH] merge-ort.c: comment typofix

and your message would begin like so (indented only for illustration
purposes---the real one should be flushed to the left edge of the
page):

	From: 王常新 <real-email-address-of-mr-wang@do.ma.in>

	There is 'needed' misspelt as 'neeed' in the source file;
	fix it.

	Signed-off-by: 王常新 <real-email-address-of-mr-wang@do.ma.in>

This feature is designed so that other people, different from the
author of the patch, can relay it to the recipient(s) while
preserving the authorship information.

Although it is not needed in this case, you can override "Subject:"
the same way with an in-body header, like so:

	From: 王常新 <real-email-address-of-mr-wang@do.ma.in>
	Subject: real title of the patch to be used

	There is 'needed' misspelt as 'neeed' in the source file;
	fix it.

	Signed-off-by: 王常新 <real-email-address-of-mr-wang@do.ma.in>

and it would replace what we read from the Subject: e-mail header.

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Bagas Sanjaya]

On 21/10/2023 00:06, Junio C Hamano wrote:
> Bagas Sanjaya <bagasdotme@gmail.com> writes:
> 
>> On 20/10/2023 09:14, 王常新 wrote:
>>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?
>>>
>>
>> Please don't top-post, reply inline with appropriate context instead.
>>
>> Did you mean that you can't receive ML traffic on your @qq.com address?
>> If so, resend with your @gmail.com address as patch author (you need
>> to set user.name and user.email accordingly). 
> 
> Isn't that opposite from what we would normally recommend, though?
> 
> If the true authorship e-mail is in an environment where sending
> patches are inconvenient, you would still want to do your commits
> under the identity you want to appear in the final history of the
> project, so you do not futz with user.name and user.email; you'd
> send a message with in-body header that shows an extra From: line
> (followed by a blank line) that records the true authorship from an
> environment whose sender e-mail address may differ.
> 
> E.g.  You would see these fields in the e-mail heeader:
> 
> 	From: 王常新 <wchangxin824@gmail.com>
> 	Subject: [PATCH] merge-ort.c: comment typofix
> 
> and your message would begin like so (indented only for illustration
> purposes---the real one should be flushed to the left edge of the
> page):
> 
> 	From: 王常新 <real-email-address-of-mr-wang@do.ma.in>
> 
> 	There is 'needed' misspelt as 'neeed' in the source file;
> 	fix it.
> 
> 	Signed-off-by: 王常新 <real-email-address-of-mr-wang@do.ma.in>
> 
> This feature is designed so that other people, different from the
> author of the patch, can relay it to the recipient(s) while
> preserving the authorship information.
> 
> Although it is not needed in this case, you can override "Subject:"
> the same way with an in-body header, like so:
> 
> 	From: 王常新 <real-email-address-of-mr-wang@do.ma.in>
> 	Subject: real title of the patch to be used
> 
> 	There is 'needed' misspelt as 'neeed' in the source file;
> 	fix it.
> 
> 	Signed-off-by: 王常新 <real-email-address-of-mr-wang@do.ma.in>
> 
> and it would replace what we read from the Subject: e-mail header.

Thanks for the explanation! I was confused then...

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

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Junio C Hamano]

王常新 <wchangxin824@gmail.com> writes:

> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?

We try to keep the name and address on Signed-off-by: the official
one that we can give court if/when some copyright troll sues us (see
Documentation/SubmittingPatches:sign-off), and one of them (if more
than one developers signed off the patch) must match the primary
author's name and address.

Thanks.

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[王常新]

> 2023年10月21日 00:44，Junio C Hamano <gitster@pobox.com> 写道：
> 
> 王常新 <wchangxin824@gmail.com> writes:
> 
>> It is my official name. But the email address is not a valid one. Should I rewrite the commit message?
> 
> We try to keep the name and address on Signed-off-by: the official
> one that we can give court if/when some copyright troll sues us (see
> Documentation/SubmittingPatches:sign-off), and one of them (if more
> than one developers signed off the patch) must match the primary
> author's name and address.
> 
> Thanks.

Sorry about that, I am not quite familiar with the process. I mean I can receive emails at both @qq.com and @gmail.com, but <foril@foril.space> in the signed-off-by trailer in the commit message doesn’t actually exist. 

Given 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?

Sincerely 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.

Re: [PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Junio C Hamano]

王常新 <wchangxin824@gmail.com> writes:

> Sorry about that, I am not quite familiar with the process. I mean
> I can receive emails at both @qq.com and @gmail.com, but
> <foril@foril.space> in the signed-off-by trailer in the commit
> message doesn’t actually exist.

I cannot tell you which between these two to use, as I do not know
your situation.  When a contributor works on Git and send a patch as
an employee of a company, sometimes the employer wants to see their
name prominently shown in the commit, and that is why we see commits
by folks working on Git for GitHub for example with their
@GitHub.com addresses, even though they may have personal addresses
at @gmail.com.  When a contribution is made as a hobbist (which I
was back when I started contributing to this project), people seem
to prefer using their personal address over using their work
address, so that the name and address recorded in the commit will
stay with them even when they move on.

Whatever name and address you choose, if you are using GGG, you'd
need to update your commits locally, perhaps like so:

  $ git commit --amend --author="Name <a@dd.re.ss>"

(and in the editor you have a chance to make sure your sign-off
matches the authorship).

After that I would suppose that you force push the result to update
your pull-request and /submit again (I am not a user of GGG, so I
may have got the details wrong).

Thanks.

[PATCH] typo: fix the typo 'neeed' into 'needed' in the comment under merge-ort.c

[Wangchangxin via GitGitGadget]

From: foril <1571825323@qq.com>

Signed-off-by: 王常新 (Wang Changxin) <foril@foril.space>
---
    typo: fix the typo 'neeed' into 'needed' in the comment under merge-o…
    
    the comments on line 2039 under merge-ort.c should be :
    this is needed if we have content merges of content merges rather than
    this is neeed if we have content merges of content merges
    
    fix the typo

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1592%2FforiLLL%2Fcomment_patch-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1592/foriLLL/comment_patch-v1
Pull-Request: https://github.com/git/git/pull/1592

 merge-ort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge-ort.c b/merge-ort.c
index 7857ce9fbd1..aee6f7d8173 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2036,7 +2036,7 @@ static int handle_content_merge(struct merge_options *opt,
 	 * the three blobs to merge on various sides of history.
 	 *
 	 * extra_marker_size is the amount to extend conflict markers in
-	 * ll_merge; this is neeed if we have content merges of content
+	 * ll_merge; this is needed if we have content merges of content
 	 * merges, which happens for example with rename/rename(2to1) and
 	 * rename/add conflicts.
 	 */

base-commit: a9ecda2788e229afc9b611acaa26d0d9d4da53ed
-- 
gitgitgadget