7.9 KiB
title | description | lead | date | draft | images | menu | weight | toc | aliases | ||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Commit Message | Authelia Development Commit Message Guidelines | This section covers the git commit message guidelines we use for development. | 2021-01-30T19:29:07+11:00 | false |
|
320 | true |
|
The reasons for these conventions are as follows:
- simple navigation though git history
- easier to read git history
Commit Message Format
Each commit message consists of a header, a body, and a footer.
<header>
<BLANK LINE>
<body>
<BLANK LINE>
<footer>
The header
is mandatory and must conform to the Commit Message Header format. The header
cannot be longer than 72 characters.
The body
is mandatory for all commits except for those of type "docs". When the body is present it must be at least 20
characters long and must conform to the Commit Message Body format.
The footer
is optional. The Commit Message Footer format describes what the footer is used
for, and the structure it must have.
Commit Message Header
<type>(<scope>): <summary>
│ │ │
│ │ └─⫸ Summary in present tense. Not capitalized. No period at the end.
│ │
│ └─⫸ Commit Scope: api|autheliabot|authentication|authorization|buildkite|bundler|cmd|
│ codecov|commands|configuration|deps|docker|duo|go|golangci-lint|
│ handlers|logging|metrics|middlewares|mocks|model|notification|npm|ntp|
│ oidc|random|regulation|renovate|reviewdog|server|session|storage|
│ suites|templates|totp|utils|web
│
└─⫸ Commit Type: build|ci|docs|feat|fix|i18n|perf|refactor|release|revert|test
The <type>
and <summary>
fields are mandatory, the (<scope>)
field is optional.
Allowed type values:
- build Changes that affect the build system or external dependencies (example scopes: bundler, deps, docker, go, npm)
- ci Changes to our CI configuration files and scripts (example scopes: autheliabot, buildkite, codecov, golangci-lint, renovate, reviewdog)
- docs Documentation only changes
- feat A new feature
- fix A bug fix
- i18n Updating translations or internationalization settings
- perf A code change that improves performance
- refactor A code change that neither fixes a bug nor adds a feature
- release Releasing a new version of Authelia
- test Adding missing tests or correcting existing tests
Allowed scope values:
The scope should be the name of the package affected (as perceived by the person reading the changelog generated from commit messages).
- authentication
- authorization
- commands
- configuration
- duo
- handlers
- logging
- metrics
- middlewares
- mocks
- model
- notification
- ntp
- oidc
- random
- regulation
- server
- session
- storage
- suites
- templates
- totp
- utils
There are currently a few exceptions to the "use package name" rule:
api
: used for changes that change the openapi specificationcmd
: used for changes to theauthelia|authelia-gen|authelia-scripts|authelia-suites
top level binariesweb
: used for changes to the React based frontend- none/empty string: useful for
test
,refactor
and changes that are done across multiple packages (e.g.test: add missing unit tests
) and for docs changes that are not related to a specific package (e.g.docs: fix typo in tutorial
).
Summary
Use the summary field to provide a succinct description of the change:
- use the imperative, present tense: "change" not "changed" nor "changes"
- don't capitalize the first letter
- no dot (.) at the end
Commit Message Body
Just as in the summary, use the imperative, present tense: "fix" not "fixed" nor "fixes".
Explain the motivation for the change in the commit message body. This commit message should explain why you are making the change. You can include a comparison of the previous behavior with the new behavior in order to illustrate the impact of the change.
Commit Message Footer
The footer can contain information about breaking changes and is also the place to reference GitHub issues and other PRs that this commit closes or is related to.
BREAKING CHANGE: <breaking change summary>
<BLANK LINE>
<breaking change description + migration instructions>
<BLANK LINE>
<BLANK LINE>
Fixes #<issue number>
Signed-off-by: <AUTHOR>
Breaking Change section should start with the phrase "BREAKING CHANGE: " followed by a summary of the breaking change, a blank line, and a detailed description of the breaking change that also includes migration instructions.
Developer Certificate of Origin
The footer MUST include the formal and conventional notation indicating the users acceptance of the Developer Certificate of Origin as described by the following agreement:
Developer's Certificate of Origin 1.1
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.
This can be achieved in the following ways:
- While making the commit use
git commit --signoff
orgit commit -s
- To correct a single commit missing the sign off
git commit –-amend --no-edit --signoff
orgit commit --amend --no-edit -s
- To correct multiple commits missing the sign off
git rebase --signoff HEAD~2
(i.e. with 2 commits that are missing the sign off)
This can be achieved by using git commit --signoff
. A single previous commit can be signed using
git commit –-amend --signoff --no-edit
. Multiple previous commits can be signed using git rebase --signoff HEAD~2
i.e. when 2 previous commits require the sign off.
Revert Commits
If the commit reverts a previous commit, it should begin with revert:
, followed by the header of the reverted commit.
The content of the commit message body should contain:
- information about the SHA of the commit being reverted in the following format:
This reverts commit <SHA>
, - a clear description of the reason for reverting the commit message.
Commit Message Examples
fix(logging): disabled colored logging outputs when file is specified
In some scenarios if a user has a log_file_path specified and a TTY seems to be detected this causes terminal coloring outputs to be written to the file.
This in turn will cause issues when attempting to utilise the log with the provided fail2ban regexes.
We now override any TTY detection/logging treatments and disable coloring/removal of the timestamp when a user is utilising the text based logger to a file.
Fixes #1480.
Signed-off-by: John Smith <jsmith@org.com>
This document is based on AngularJS Git Commit Message Format.