guix/etc/git/commit-msg, branch master Transactional package manager, declarative GNU/Linux distribution, reproducible deployment tool, and more! https://guix.gnu.org Revert "build: Add a commit-msg hook that embeds Change-Id in commit messages." 2026-06-12T09:19:18+00:00 Maxim Cournoyer maxim@guixotic.coop 2025-08-01T05:46:58+00:00 81a7856dd893aab74ff5562aa6d90aa7ec70c05f This reverts commit 8005e09b261d65bf0f7469cd8e89423c1c1db820 and follow-ups. This was added 2 years ago to be able to trace commits between the git repository and the guix-patches tracker, and to implement a solution to automatically close merged commits (which has not materialized). Since we have now migrated to Codeberg, the cross-referencing between reviewed commits (pull requests) and the actual commits merged can be done in the Codeberg UI (via the 'manually merged' option), and Codeberg also supports closing a bug via the "Fixes: #NNN" git trailer, and as a convention we can add a "Merges: !NNN" git trailer in a commit closing a PR (the actual closing is not yet implemented by Forgejo), which mostly obsoletes the purpose of the Change-Id git trailer. 
This reverts commit 8005e09b261d65bf0f7469cd8e89423c1c1db820 and follow-ups.
This was added 2 years ago to be able to trace commits between the git
repository and the guix-patches tracker, and to implement a solution to
automatically close merged commits (which has not materialized).

Since we have now migrated to Codeberg, the cross-referencing between reviewed
commits (pull requests) and the actual commits merged can be done in the
Codeberg UI (via the 'manually merged' option), and Codeberg also supports
closing a bug via the "Fixes: #NNN" git trailer, and as a convention we can
add a "Merges: !NNN" git trailer in a commit closing a PR (the actual closing
is not yet implemented by Forgejo), which mostly obsoletes the purpose of the
Change-Id git trailer.
Update commit-msg hook. 2026-05-29T05:09:15+00:00 Maxim Cournoyer maxim@guixotic.coop 2026-05-29T05:08:33+00:00 39baeaa58fea76fe322d271c3e7451f4923d0e2b Retrieved from <https://gerrit.googlesource.com/gerrit/+/refs/heads/master/resources/com/google/gerrit/server/tools/root/hooks/commit-msg>. Fixes: <https://issues.guix.gnu.org/81044> Change-Id: Ia0bbc6fac3354df6162c813fe94c344a041ffbaf Reported-by: Tomas Volf <~@wolfsden.cz> 
Retrieved from <https://gerrit.googlesource.com/gerrit/+/refs/heads/master/resources/com/google/gerrit/server/tools/root/hooks/commit-msg>.

Fixes: <https://issues.guix.gnu.org/81044>
Change-Id: Ia0bbc6fac3354df6162c813fe94c344a041ffbaf
Reported-by: Tomas Volf <~@wolfsden.cz>
etc: Update the commit-msg hook. 2025-02-22T14:55:24+00:00 Maxim Cournoyer maxim.cournoyer@gmail.com 2025-02-10T14:18:37+00:00 b93b7c4a91023c45ca8fc26e17215bb807d43eb5 Update our copy to the latest version retrieved from <https://gerrit.googlesource.com/gerrit/+/refs/heads/master/resources/com/google/gerrit/server/tools/root/hooks/commit-msg>. This change contains an improved version which avoids creating duplicate Change-Id git trailer when rebasing. * etc/git/commit-msg: Update to latest version, taking care to preserve our changes. Change-Id: Ie6ae6aa5e81cd4fce28a6be5cd68ca0a61cdebc0 
Update our copy to the latest version retrieved from
<https://gerrit.googlesource.com/gerrit/+/refs/heads/master/resources/com/google/gerrit/server/tools/root/hooks/commit-msg>.

This change contains an improved version which avoids creating duplicate
Change-Id git trailer when rebasing.

* etc/git/commit-msg: Update to latest version, taking care to preserve our changes.

Change-Id: Ie6ae6aa5e81cd4fce28a6be5cd68ca0a61cdebc0
build: Add a commit-msg hook that embeds Change-Id in commit messages. 2023-10-22T20:09:04+00:00 Maxim Cournoyer maxim.cournoyer@gmail.com 2023-10-08T16:18:13+00:00 8005e09b261d65bf0f7469cd8e89423c1c1db820 Partially implements <https://issues.guix.gnu.org/66027>. This will make it possible to track a merged commit back to its original posting on the mailing list, and open the door to new opportunities such as closing fully merged series automatically. * Makefile.am (COMMIT_MSG_MAGIC): New variable. (.git/hooks/commit-msg): New target. * etc/git/commit-msg: New file. * doc/contributing.texi (Configuring Git): Document Change-Id. Series-changes: 3 - Clarify documentation text, as suggested by Simon Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6 Reviewed-by: Simon Tournier <zimon.toutoune@gmail.com> 
Partially implements <https://issues.guix.gnu.org/66027>.

This will make it possible to track a merged commit back to its original
posting on the mailing list, and open the door to new opportunities such as
closing fully merged series automatically.

* Makefile.am (COMMIT_MSG_MAGIC): New variable.
(.git/hooks/commit-msg): New target.
* etc/git/commit-msg: New file.
* doc/contributing.texi (Configuring Git): Document Change-Id.

Series-changes: 3
 - Clarify documentation text, as suggested by Simon
Change-Id: Ia92fa958eae600fdd4e180bad494c85db8bb4dd6
Reviewed-by: Simon Tournier <zimon.toutoune@gmail.com>