guix/etc/git, branch ruby-team Transactional package manager, declarative GNU/Linux distribution, reproducible deployment tool, and more! https://guix.gnu.org etc: gitconfig: Use 'histogram' algorithm for diffs. 2026-06-29T05:20:29+00:00 Maxim Cournoyer maxim@guixotic.coop 2026-06-08T01:56:36+00:00 f610dda023018768033addeea5dee9537002e468 * etc/git/gitconfig [diff] <algorithm>: Set option to histogram. 
* etc/git/gitconfig [diff] <algorithm>: Set option to histogram.
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: Ensure guix.authenticate section is populated in post-merge hook. 2026-03-23T23:53:50+00:00 Maxim Cournoyer maxim@guixotic.coop 2026-03-21T03:05:54+00:00 83dfc5475d011095dcded8a4e9a30a1cd1ded34b This provides some extra automation. * etc/git/post-merge [!guix.authenticate.introduction-commit]: Run initial 'guix authenticate' command, as documented in (info "(guix) Building from Git"). Fixes: <https://issues.guix.gnu.org/80564> Change-Id: I5775514c6b8785213e2d0e834bdd7e3a961c8930 Reported-by: Tomas Volf <~@wolfsden.cz> 
This provides some extra automation.

* etc/git/post-merge [!guix.authenticate.introduction-commit]: Run
initial 'guix authenticate' command, as documented in (info "(guix) Building
from Git").

Fixes: <https://issues.guix.gnu.org/80564>
Change-Id: I5775514c6b8785213e2d0e834bdd7e3a961c8930
Reported-by: Tomas Volf <~@wolfsden.cz>
gitconfig: Relax useAutoBase. 2025-07-31T03:53:42+00:00 Maxim Cournoyer maxim@guixotic.coop 2025-07-31T03:50:11+00:00 958bc01404cc6213c30cdbad253fa82b55daeec2 It can be useful to produce patches from older commits, for example to share commits from the keyring branch between the main Guix repository and guix-maintenance. The previous 'true' value prevented that with a fatal error message. * etc/git/gitconfig [format] <useAutoBase>: Set to whenAble. Change-Id: Ib32407dd3695dcadcb16855b1b87147fabc2aca7 
It can be useful to produce patches from older commits, for example to share
commits from the keyring branch between the main Guix repository and
guix-maintenance. The previous 'true' value prevented that with a fatal error
message.

* etc/git/gitconfig [format] <useAutoBase>: Set to whenAble.

Change-Id: Ib32407dd3695dcadcb16855b1b87147fabc2aca7
etc: pre-push: Skip checks when pushing to the keyring branch. 2025-07-20T03:00:53+00:00 Maxim Cournoyer maxim@guixotic.coop 2025-07-20T02:41:34+00:00 8a82b6b9c1c90885a069cf9422e9ea0468344b08 Attempting to push new commits to the branch would previously fail like: error: commit X is not a descendant of introductory commit 1m9edb3f66fd807b096b48283debdcddccfea34bad * etc/git/pre-push (main): Skip checks when pushing to refs/heads/keyring. Change-Id: I3ea20a10b6c8cc6b6c6f948f80bed902850214c5 
Attempting to push new commits to the branch would previously fail like:

  error: commit X is not a descendant of introductory commit
  1m9edb3f66fd807b096b48283debdcddccfea34bad

* etc/git/pre-push (main): Skip checks when pushing to refs/heads/keyring.

Change-Id: I3ea20a10b6c8cc6b6c6f948f80bed902850214c5
etc: Git pre-push hook: Don't allow pushes to Savannah. 2025-06-08T21:46:34+00:00 Leo Famulari leo@famulari.name 2025-06-05T21:15:21+00:00 69a77ffab2407c2150d59bffc0ae2ab04161c9da * etc/git/pre-push: Throw an error when pushing to savannah.gnu.org. Change-Id: I1fefa4d93daf0f2887168c54a244b9be5d220665 
* etc/git/pre-push: Throw an error when pushing to savannah.gnu.org.

Change-Id: I1fefa4d93daf0f2887168c54a244b9be5d220665
etc: pre-push Git hook: Update the commentary. 2025-06-05T02:55:22+00:00 Leo Famulari leo@famulari.name 2025-06-05T02:54:56+00:00 027a47787f8dcf6651a1c20c5b475376defe6d6b * etc/git/pre-push: Improve comments. Change-Id: Id8c97841c3fa362de7adbd8942f796d044ce50b1 
* etc/git/pre-push: Improve comments.

Change-Id: Id8c97841c3fa362de7adbd8942f796d044ce50b1
etc: pre-push git hook: Also check Codeberg SSH remote. 2025-06-05T02:29:03+00:00 Hilton Chain hako@ultrarare.space 2025-06-04T15:23:31+00:00 50b69ecb4017841c7663d1c1e663d8ad02a3cfa3 * etc/git/pre-push (main): Check Codeberg SSH remote. Fixes: #421 Change-Id: Id669259f510cf3e33cadf77a5c9eeada52a5d0dd 
* etc/git/pre-push (main): Check Codeberg SSH remote.

Fixes: #421
Change-Id: Id669259f510cf3e33cadf77a5c9eeada52a5d0dd
etc: pre-push Git hook: Reduce code duplication. 2025-05-30T21:14:34+00:00 Leo Famulari leo@famulari.name 2025-05-28T16:31:23+00:00 68deb8e3bda83a84acfe192392a66ecba19cece6 * etc/git/pre-push (perform_checks): New function. Change-Id: Ieff1e2c225e3720c96c75ca55abfb883dd386f5c 
* etc/git/pre-push (perform_checks): New function.

Change-Id: Ieff1e2c225e3720c96c75ca55abfb883dd386f5c