guix/etc/git, branch koszko

etc: Update the commit-msg hook.

2025-02-22T14:55:24Z

Update our copy to the latest version retrieved from . 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

maint: Actually run ‘make check-channel-news’ in pre-push hook.

2025-02-15T23:20:13Z

Fixes a bug introduced in ab9cda9ebd00073d5a0783919809f2e564f141e9 where ‘make check-channel-news’ would not longer be executed. * etc/git/pre-push: Remove ‘exec’ before ‘guix git authenticate’. Change-Id: Ic425db866e44695493be96a0a8c81c77c815e42d

etc: git: pre-push: Run guix git authenticate before check-channel-news.

2025-01-05T21:23:54Z

Running check-channel-news first could potentially be untrusted code, so authenticate first. * etc/git/pre-push: Run guix git authenticate before check-channel-news.

maint: Suggest ‘guix git authenticate’ for initial authentication.

2024-05-25T14:23:56Z

The previous recommendation, running ‘make authenticate’, was insecure because it led users to run code from the very repository they want to authenticate: https://lists.gnu.org/archive/html/guix-devel/2024-04/msg00252.html * Makefile.am (commit_v1_0_0, channel_intro_commit) (channel_intro_signer, GUIX_GIT_KEYRING, authenticate): Remove. * Makefile.am (.git/hooks/%): New target, generalization of previous ‘.git/hooks/pre-push’ target. (nodist_noinst_DATA): Add ‘.git/hooks/post-merge’. * doc/contributing.texi (Building from Git): Suggest ‘guix git authenticate’ instead of ‘make authenticate’. * etc/git/post-merge: New file. * etc/git/pre-push: Run ‘guix git authenticate’ instead of ‘make authenticate’. Reviewed-by: Maxim Cournoyer Reported-by: Skyler Ferris Change-Id: Ia415aa8375013d0dd095e891116f6ce841d93efd

gitconfig: b4: Automatically add 'Signed-off-by' when applying patches.

2024-01-24T15:42:41Z

Also use --3way to ease conflict resolutions. * etc/git/gitconfig [b4]: Add shazam-am-flags option. Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea

doc: Add some guidelines for reviewing.

2023-11-07T17:33:25Z

* doc/contributing.texi (Contributing) [Reviewing the Work of Others]: New section. (Debbugs Usertags): Expound with Emacs Debbugs information and document the 'reviewed-looks-good' usertag. * etc/git/gitconfig [b4]: New section. Change-Id: I56630b15ec4fbc5c67e5420dbf2838556a005d6b Reviewed-by: Ludovic Courtès

build: Add a commit-msg hook that embeds Change-Id in commit messages.

2023-10-22T20:09:04Z

Partially implements . 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

etc: gitconfig: Do not enforced signed commits.

2023-05-19T03:17:31Z

This change was more invasive than initially thought, and cannot be disabled easily, as raised by a few people. Let's revert it for now. At least the pre-push hook should be deployed automatically and catch any unsigned commits attempted to be pushed to Savannah. * etc/git/gitconfig [commit]: Remove section.

Makefile.am: Auto-configure Git on 'make'.

2023-05-01T16:39:11Z

This means we do not need to worry anymore about manually syncing the pre-push git hook or the Guix-provided git configuration. * etc/git/gitconfig: Augment configuration template with useful options to allow for auto-configuration. * Makefile.am (.git/hooks/pre-push, .git/config): New targets. (nodist_noinst_DATA): New primary variable holding the above targets.

Add git configuration templates to improve diff hunk header detection.

2021-10-13T22:24:34Z

This is a follow-up to commit 9fc8ae4171e5da4939a64fc6d684c8b9d85bbe84, which missed two hunks from . Reported by hackeryarn on #guix. * .gitattributes, etc/git/gitconfig: New files. Signed-off-by: Marius Bakke