Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typo: fix the typo 'neeed' into 'needed' in the comment under merge-o… #1592

Closed
wants to merge 1 commit into from

Conversation

foriLLL
Copy link

@foriLLL foriLLL commented Oct 15, 2023

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

@gitgitgadget-git
Copy link

Welcome to GitGitGadget

Hi @foriLLL, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that your Pull Request has a good description, as it will be used as cover letter. You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <revi.ewer@example.com>, Ill Takalook <ill.takalook@example.net>

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

@foriLLL
Copy link
Author

foriLLL commented Oct 15, 2023

@Red54 I've just created my first PR, could you please /allow me?

@Red54
Copy link
Contributor

Red54 commented Oct 15, 2023

/allow

@gitgitgadget-git
Copy link

User foriLLL is now allowed to use GitGitGadget.

WARNING: foriLLL has no public email address set on GitHub;
GitGitGadget needs an email address to Cc: you on your contribution, so that you receive any feedback on the Git mailing list. Go to https://github.com/settings/profile to make your preferred email public to let GitGitGadget know which email address to use.

@foriLLL
Copy link
Author

foriLLL commented Oct 15, 2023

/submit

@foriLLL
Copy link
Author

foriLLL commented Oct 15, 2023

/preview

@gitgitgadget-git
Copy link

Submitted as pull.1592.git.git.1697378928693.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-git-1592/foriLLL/comment_patch-v1

To fetch this version to local tag pr-git-1592/foriLLL/comment_patch-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-git-1592/foriLLL/comment_patch-v1

@gitgitgadget-git
Copy link

Preview email sent as pull.1592.v2.git.git.1697378981479.gitgitgadget@gmail.com

@foriLLL
Copy link
Author

foriLLL commented Oct 19, 2023

/submit

@gitgitgadget-git
Copy link

Error: 737eccd was already submitted

@foriLLL
Copy link
Author

foriLLL commented Oct 19, 2023

/preview

@gitgitgadget-git
Copy link

Preview email sent as pull.1592.v2.git.git.1697683483516.gitgitgadget@gmail.com

@Red54
Copy link
Contributor

Red54 commented Oct 19, 2023

Your commit title exceeds the soft limit of 50 characters.
You may consider changing it to "merge-ort.c: fix typo 'neeed' to 'needed'"

@foriLLL
Copy link
Author

foriLLL commented Oct 19, 2023

Your commit title exceeds the soft limit of 50 characters. You may consider changing it to "merge-ort.c: fix typo 'neeed' to 'needed'"

Thanks for the help! What should I do then? Shall I open another PR?

@Red54
Copy link
Contributor

Red54 commented Oct 19, 2023

Your commit title exceeds the soft limit of 50 characters. You may consider changing it to "merge-ort.c: fix typo 'neeed' to 'needed'"

Thanks for the help! What should I do then? Shall I open another PR?

"What happens after GitGitGadget sent the mails?"
https://gitgitgadget.github.io/

@foriLLL
Copy link
Author

foriLLL commented Oct 19, 2023

Your commit title exceeds the soft limit of 50 characters. You may consider changing it to "merge-ort.c: fix typo 'neeed' to 'needed'"

Thanks for the help! What should I do then? Shall I open another PR?

"What happens after GitGitGadget sent the mails?" https://gitgitgadget.github.io/

No one commented in the mailing list I believe.

@dscho
Copy link
Member

dscho commented Oct 19, 2023

@foriLLL maybe you want to reply with a gentle "ping?" (follow the reply to this advice with the link https://lore.kernel.org/git/pull.1592.git.git.1697378928693.gitgitgadget@gmail.com)

@Red54
Copy link
Contributor

Red54 commented Oct 19, 2023

Your commit title exceeds the soft limit of 50 characters. You may consider changing it to "merge-ort.c: fix typo 'neeed' to 'needed'"

Thanks for the help! What should I do then? Shall I open another PR?

"What happens after GitGitGadget sent the mails?" https://gitgitgadget.github.io/

No one commented in the mailing list I believe.

https://gitgitgadget.github.io/#what-happens-after-gitgitgadget-sent-the-mails

"If your patches need to be revised, please use git rebase -i to do that, then force-push, then update the description of the Pull Request by adding a summary of the changes you made, and then issue another /submit."

@foriLLL
Copy link
Author

foriLLL commented Oct 19, 2023

/submit

@gitgitgadget-git
Copy link

Submitted as pull.1592.v2.git.git.1697719216137.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-git-1592/foriLLL/comment_patch-v2

To fetch this version to local tag pr-git-1592/foriLLL/comment_patch-v2:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-git-1592/foriLLL/comment_patch-v2

Signed-off-by: 王常新 (Wang Changxin) <wchangxin824@gmail.com>
@foriLLL
Copy link
Author

foriLLL commented Oct 22, 2023

/submit

@gitgitgadget-git
Copy link

Submitted as pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-git-1592/foriLLL/comment_patch-v3

To fetch this version to local tag pr-git-1592/foriLLL/comment_patch-v3:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-git-1592/foriLLL/comment_patch-v3

@gitgitgadget-git
Copy link

This branch is now known as wx/merge-ort-comment-typofix.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via fb3934f.

@gitgitgadget-git
Copy link

This patch series was integrated into next via ad1e338.

@gitgitgadget-git
Copy link

There was a status update in the "New Topics" section about the branch wx/merge-ort-comment-typofix on the Git mailing list:

Typofix.

Will merge to 'master'.
source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>

@foriLLL
Copy link
Author

foriLLL commented Oct 23, 2023

@Red54 @dscho Thanks so much for the help, really appreciate it.

@foriLLL foriLLL closed this Oct 23, 2023
@foriLLL foriLLL reopened this Oct 23, 2023
@gitgitgadget-git
Copy link

This patch series was integrated into seen via 1da7533.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via d5fbc0a.

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 58deff8.

@gitgitgadget-git
Copy link

There was a status update in the "Cooking" section about the branch wx/merge-ort-comment-typofix on the Git mailing list:

Typofix.

Will merge to 'master'.
source: <pull.1592.v3.git.git.1697942768555.gitgitgadget@gmail.com>

@gitgitgadget-git
Copy link

This patch series was integrated into seen via 9a48da7.

@gitgitgadget-git
Copy link

This patch series was integrated into master via 9a48da7.

@gitgitgadget-git
Copy link

This patch series was integrated into next via 9a48da7.

@gitgitgadget-git
Copy link

Closed via 9a48da7.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants