diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 70d14b97..82f3435d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,7 +169,7 @@ check-ci-script: - exit 1 # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected, etc. # check-commit: @@ -177,7 +177,7 @@ check-commit: - .fdo.ci-fairy stage: sanity check script: - - ci-fairy -vv check-commits --signed-off-by --junit-xml=results.xml && exit 0 || true + - ci-fairy -vv check-commits --junit-xml=results.xml && exit 0 || true - > printf "%s\n" \ "Error checking commit format. Please verify" \ diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template index 21bb4046..ff4189d4 100644 --- a/.gitlab-ci/ci.template +++ b/.gitlab-ci/ci.template @@ -157,7 +157,7 @@ check-ci-script: - exit 1 # -# Verify that commit messages are as expected, signed-off, etc. +# Verify that commit messages are as expected, etc. # check-commit: @@ -165,7 +165,7 @@ check-commit: - .fdo.ci-fairy stage: sanity check script: - - ci-fairy -vv check-commits --signed-off-by --junit-xml=results.xml && exit 0 || true + - ci-fairy -vv check-commits --junit-xml=results.xml && exit 0 || true - > printf "%s\n" \ "Error checking commit format. Please verify" \ diff --git a/.triage-policies.yml b/.triage-policies.yml index 0eb18263..c28894dc 100644 --- a/.triage-policies.yml +++ b/.triage-policies.yml @@ -33,8 +33,7 @@ resource_rules: - "bugbot::commit-rules" comment: | Hi. Looks like the pipeline failed because one or more of the commits in this MR do not meet our requirements. - Most commonly this is a missing Signed-off-by, sometimes its the format of the commit message itself. - The "Test summary" above has the details. + Most commonly this the format of the commit message itself. The "Test summary" above has the details. Please see [our docs for commit messages](https://wayland.freedesktop.org/libinput/doc/latest/contributing.html#commit-messages) and [our docs for submitting code](https://wayland.freedesktop.org/libinput/doc/latest/contributing.html#submitting-code) diff --git a/CODING_STYLE.md b/CODING_STYLE.md index 31c080ea..1101a448 100644 --- a/CODING_STYLE.md +++ b/CODING_STYLE.md @@ -211,38 +211,6 @@ the approach chosen was correct. A good commit message also helps maintainers to decide if a given patch is suitable for stable branches or inclusion in a distribution. -## Developer Certificate of Origin - -Your commit **must** be signed off with a line: -``` -Signed-off-by: -``` -By signing off, you indicate the [developer certificate of origin](https://developercertificate.org/). - -> By making a contribution to this project, I certify that: -> -> (a) The contribution was created in whole or in part by me and I -> have the right to submit it under the open source license -> indicated in the file; or -> -> (b) The contribution is based upon previous work that, to the best -> of my knowledge, is covered under an appropriate open source -> license and I have the right under that license to submit that -> work with modifications, whether created in whole or in part -> by me, under the same open source license (unless I am -> permitted to submit under a different license), as indicated -> in the file; or -> -> (c) The contribution was provided directly to me by some other -> person who certified (a), (b) or (c) and I have not modified -> it. -> -> (d) I understand and agree that this project and the contribution -> are public and that a record of the contribution (including all -> personal information I submit with it, including my sign-off) is -> maintained indefinitely and may be redistributed consistent with -> this project or the open source license(s) involved. - ## Commit message format The canonical git commit message format is: @@ -257,8 +225,6 @@ supported. You can include extra data where required like: - benchmark one says 10s - benchmark two says 12s - -Signed-off-by: ``` The subject line is the first thing everyone sees about this commit, so make @@ -270,9 +236,8 @@ sure it's on point. "change foo to bar", not "changed foo to bar". - The text width of the commit should be 78 chars or less, especially the subject line. -- The author and signed-off-by must be the name you usually identify - as and email address. We do not accept the default `@users.noreply` gitlab - addresses. +- The author must be the name you usually identify as and email address. We do + not accept the default `@users.noreply` gitlab addresses. ``` git config --global user.name Your Name git config --global user.email your@email diff --git a/doc/user/contributing.rst b/doc/user/contributing.rst index 2bec23ad..41f99978 100644 --- a/doc/user/contributing.rst +++ b/doc/user/contributing.rst @@ -266,25 +266,6 @@ same file(s) as the patch being sent. Commit Messages ------------------------------------------------------------------------------ -Commit messages **must** contain a **Signed-off-by** line with your name -and email address. An example is: :: - - A description of this commit, and it's great work. - - Signed-off-by: Claire Someone - -If you're not the patch's original author, you should -also gather S-o-b's by them (and/or whomever gave the patch to you.) The -significance of this is that it certifies that you created the patch, that -it was created under an appropriate open source license, or provided to you -under those terms. This lets us indicate a chain of responsibility for the -copyright status of the code. An example is: :: - - A description of this commit, and it's great work. - - Signed-off-by: Claire Someone - Signed-off-by: Ferris Crab - When you re-send patches, revised or not, it would be very good to document the changes compared to the previous revision in the commit message and/or the merge request. If you have already received Reviewed-by or Acked-by tags, you @@ -353,26 +334,6 @@ step failed. Follow the appropriate section to fix the errors. -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Missing "Signed-off-by: author information" -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -As explained in :ref:`contributing_commit_messages`, every commit must contain a -Signed-off-by line with your name and email address. - -When this line is not present, it can be added to your commit afterwards: :: - - git commit --amend -s - -If the merge request contains more than one commit, it must be added to all of -them: :: - - git rebase --interactive --exec 'git commit --amend -s' main - -Once the problem is fixed, force-push your branch. See -:ref:`contributing_submitting_code` for more details about how to push your code -and interactive rebases. - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Committed gitlab-ci.yml differs from generated gitlab-ci.yml. Please verify ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~