Skip to content

Comments

correct spelling errors detected by Debian lintian#5801

Closed
andreasschulze wants to merge 1 commit intoopenssl:masterfrom
andreasschulze:spelling-errors
Closed

correct spelling errors detected by Debian lintian#5801
andreasschulze wants to merge 1 commit intoopenssl:masterfrom
andreasschulze:spelling-errors

Conversation

@andreasschulze
Copy link

@andreasschulze andreasschulze commented Mar 29, 2018

trivial contribution
CLA: trivial

Checklist
  • documentation is added or updated

@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Mar 29, 2018
Copy link
Contributor

@richsalz richsalz left a comment

Choose a reason for hiding this comment

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

Can you sign our CLA or put

CLA: trivial

in the body of your commit message? Thank you! I agree this is trivial.

@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Mar 29, 2018
@mspncp
Copy link
Contributor

mspncp commented Mar 29, 2018

Reopening, to give the cla bot another try.

@mspncp mspncp closed this Mar 29, 2018
@mspncp mspncp reopened this Mar 29, 2018
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Mar 29, 2018
@andreasschulze
Copy link
Author

unsure about the best way to put "CLA: trivial" in a commit message.
I now followed https://help.github.com/articles/changing-a-commit-message/
and see an updated commit message in my repo: https://github.com/andreasschulze/openssl/commit/eda70ef8a6722ad3f92261e2e901dcb30c6dbb6e

Is this enougth or should I create a new pull request?

@mspncp
Copy link
Contributor

mspncp commented Mar 29, 2018

No, the cla bot should have stopped complaining now. @richsalz or @levitte, any ideas why that didn't work?

@richsalz
Copy link
Contributor

I see that the email is not what we have in our CLA list (see the cla-check above). Send a new CLA or set the Author to be your regular email.

@levitte levitte closed this Apr 19, 2018
@levitte levitte reopened this Apr 19, 2018
@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label Apr 19, 2018
@levitte
Copy link
Member

levitte commented Apr 19, 2018

The reason that the CLA checker can't process this correctly is that the commit message looks like this:

correct spelling errors detected by Debian lintian
CLA: trivial

There's no empty line between the two, which means that they get merged into a subject line in git terms. If you look at the resulting patch, you can see clearly what happens. This is an impossible thing to check correctly...

So I think that we can approve this, and if need be, edit the commit message to insert that empty line when merging. I can take it upon myself, if everyone that approves agrees this is legally trivial.

Copy link
Member

@levitte levitte left a comment

Choose a reason for hiding this comment

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

Formally: this is legally trivial

@levitte levitte removed the hold: cla required The contributor needs to submit a license agreement label Apr 19, 2018
@levitte levitte self-assigned this Apr 19, 2018
@mspncp
Copy link
Contributor

mspncp commented Apr 19, 2018

I agree it's trivial.

@levitte
Copy link
Member

levitte commented Apr 19, 2018

Merged into master.

aa3b328 correct spelling errors detected by Debian lintian

levitte pushed a commit that referenced this pull request Apr 19, 2018
CLA: trivial

Reviewed-by: Matthias St. Pierre <[email protected]>
Reviewed-by: Richard Levitte <[email protected]>
(Merged from #5801)
@levitte
Copy link
Member

levitte commented Apr 19, 2018

This should really be cherry-picked to 1.1.0 and possibly 1.0.2. Does anyone approve?

@mspncp
Copy link
Contributor

mspncp commented Apr 19, 2018

+1. Go ahead, if it applies.

@levitte
Copy link
Member

levitte commented Apr 19, 2018

Actually, it seems the changes here only apply to master, so closing this

@levitte levitte closed this Apr 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants