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

doc: improve documentation for commit subject line #8546

Merged
merged 1 commit into from
Sep 29, 2016

Conversation

lpinca
Copy link
Member

@lpinca lpinca commented Sep 15, 2016

Checklist
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

doc

Description of change

Specify that commit subject line must be made of only lowercase words and should start with an imperative verb.

@nodejs-github-bot nodejs-github-bot added the doc Issues and PRs related to the documentations. label Sep 15, 2016
@lpinca lpinca force-pushed the update/commit-message-guidelines branch from 6ed8a91 to 9491458 Compare September 15, 2016 12:55
description of the change. All words in the description must be in lowercase
with the exception of the ones that refer to code (e.g. function/variable
names). The description must be prefixed with the name of the changed
subsystem and should start with a present-tense verb (e.g. "net: add
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe present-tense or imperative verb? Present tense is easier to understand, but imperative is I think more accurate.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gibfahn I used present-tense here as per this comment: #8479 (comment).

Not sure but there seems to be a risk of bike-shedding.

The risk is confirmed. I'm happy to use whatever is best for the purpose.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be clear, I don't mind either, I just thought it might be easiest to have both, thus avoiding the issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's fine with me, updating.

@lpinca lpinca force-pushed the update/commit-message-guidelines branch from 9491458 to 0fc4e81 Compare September 15, 2016 14:22
Copy link
Contributor

@Fishrock123 Fishrock123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would change must to should -- we don't need more hard barriers for PRs, and we can always fix these up ourselves.

@lpinca
Copy link
Member Author

lpinca commented Sep 15, 2016

@Fishrock123 both of them?

Copy link
Member

@jasnell jasnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with the changes! Thank you!

Copy link
Member

@Trott Trott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a nit, but this LGTM with or without the nit addressed.

description of the change prefixed with the name of the changed
subsystem (e.g. "net: add localAddress and localPort to Socket").
description of the change. All words in the description should be in
lowercase with the exception of the ones that refer to code (e.g.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: The exception is not quite broad enough. We also make exceptions for proper nouns (Linux Foundation), acronyms (MIT license), and probably other things I'm forgetting. How to communicate this succinctly is a challenge, though, and this LGTM as-is.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a commit to specify that proper nouns and acronyms should not be lowercased.
If we are forgetting something I think we can always add it later.

@gibfahn
Copy link
Member

gibfahn commented Sep 16, 2016

LGTM

@lpinca
Copy link
Member Author

lpinca commented Sep 19, 2016

@Fishrock123 are you ok with the changes?

@jasnell
Copy link
Member

jasnell commented Sep 22, 2016

Ping @Fishrock123

(e.g. "net: add localAddress and localPort to Socket").
function/variable names), proper nouns, and acronyms. The description should
be prefixed with the name of the changed subsystem and start with a
present-tense or imperative verb (e.g. "net: add localAddress and localPort
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine with this landing as-is. I want to add: I know I'm the person who said present-tense may be preferable to imperative verb. I'm starting to have second thoughts. fixing would be present tense but is not OK. An imperative verb will always be OK (I think). So if you'd prefer to just use imperative and drop present-tense, I'd be OK with that.

So, yeah, either way, LGTM.

Nit: I prefer we write out for example rather than rely on e.g.. Again, LGTM as is, and LGTM with that change. Either way.

Copy link
Member Author

@lpinca lpinca Sep 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Trott I'll address those two nits tomorrow, I'm too sleepy now. Just let me know what's better to use. @gibfahn suggested "present-tense or imperative" to avoid confusion but I also think that it is not totally correct and only "imperative" would be better. As a non native speaker I can't make a decision.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I now favor just "imperative verb" and dropping "present-tense" but if anyone (@gibfahn or otherwise) feels that including present-tense is better, that's OK too.

@lpinca
Copy link
Member Author

lpinca commented Sep 23, 2016

PTAL.

@gibfahn
Copy link
Member

gibfahn commented Sep 23, 2016

I agree with that Imperative is more accurate, I assumed the idea behind present tense was to make things easier for non-native speakers, but as @Trott mentioned, it would probably add to their confusion rather than making things clearer.

Therefore the changes LGTM, thanks for dealing with all the nits @lpinca

@Trott
Copy link
Member

Trott commented Sep 23, 2016

LGTM

Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pile-on LGTM!

@lpinca
Copy link
Member Author

lpinca commented Sep 28, 2016

@Fishrock123 ping.

@Trott
Copy link
Member

Trott commented Sep 29, 2016

@Fishrock123 This looks like it's stalled on your review, which seems like a nit more than anything else. This can land, yes?

@Fishrock123
Copy link
Contributor

go ahead if you wana land it :D

Specify that commit subject line must be made of only lowercase words
and should start with an imperative verb.

PR-URL: nodejs#8546
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
@lpinca lpinca force-pushed the update/commit-message-guidelines branch from 93f5e9f to a4d396d Compare September 29, 2016 06:45
@lpinca
Copy link
Member Author

lpinca commented Sep 29, 2016

Landed in a4d396d

@lpinca lpinca closed this Sep 29, 2016
@lpinca lpinca merged commit a4d396d into nodejs:master Sep 29, 2016
@lpinca lpinca deleted the update/commit-message-guidelines branch September 29, 2016 06:48
jasnell pushed a commit that referenced this pull request Sep 29, 2016
Specify that commit subject line must be made of only lowercase words
and should start with an imperative verb.

PR-URL: #8546
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Fishrock123 pushed a commit that referenced this pull request Oct 11, 2016
Specify that commit subject line must be made of only lowercase words
and should start with an imperative verb.

PR-URL: #8546
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Gibson Fahnestock <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Jeremiah Senkpiel <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc Issues and PRs related to the documentations.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants