me
/
guix
Archived
1
0
Fork 0
Commit Graph

12 Commits (master)

Author SHA1 Message Date
Ludovic Courtès 73b3f941d7
maint: Suggest ‘guix git authenticate’ for initial authentication.
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 <maxim.cournoyer@gmail.com>
Reported-by: Skyler Ferris <skyvine@protonmail.com>
Change-Id: Ia415aa8375013d0dd095e891116f6ce841d93efd
2024-05-25 16:23:56 +02:00
Maxim Cournoyer 1348be9115
gitconfig: b4: Automatically add 'Signed-off-by' when applying patches.
Also use --3way to ease conflict resolutions.

* etc/git/gitconfig [b4]: Add shazam-am-flags option.

Change-Id: I6a92909a5b23a8680c16251aafa084b9a48944ea
2024-01-24 10:42:41 -05:00
Maxim Cournoyer 889a6204f8
doc: Add some guidelines for reviewing.
* 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 <ludo@gnu.org>
2023-11-07 12:33:25 -05:00
Maxim Cournoyer 8005e09b26
build: Add a commit-msg hook that embeds Change-Id in commit messages.
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>
2023-10-22 16:09:04 -04:00
Maxim Cournoyer 03b453cfe5
etc: gitconfig: Do not enforced signed commits.
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.
2023-05-18 23:17:31 -04:00
Maxim Cournoyer 8b972da068
Makefile.am: Auto-configure Git on 'make'.
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.
2023-05-01 12:39:11 -04:00
Sarah Morgensen f8b10932c8
Add git configuration templates to improve diff hunk header detection.
This is a follow-up to commit 9fc8ae4171, which
missed two hunks from <https://issues.guix.gnu.org/50363>.

Reported by hackeryarn on #guix.

* .gitattributes, etc/git/gitconfig: New files.

Signed-off-by: Marius Bakke <marius@gnu.org>
2021-10-14 00:24:34 +02:00
Leo Famulari 80ebcdd100
maint: Only run `make authenticate` when pushing commits.
* etc/git/pre-push: Exit early when deleting a branch.
2020-12-14 12:15:06 -05:00
Ludovic Courtès 6f6758c45d
maint: Adjust comment in 'pre-push' hook.
* etc/git/pre-push: Adjust comment.
2020-06-01 00:51:38 +02:00
Ludovic Courtès e65a44649e
maint: Git pre-push hook runs "make authenticate check-channel-news".
* etc/git/pre-push: Change to run "make authenticate check-channel-news".
2020-05-29 18:31:38 +02:00
Leo Famulari f0d0c5bb18
etc: The pre-push hook says which commits failed the signature check.
* etc/git/pre-push: Check each commit's signature individually so that
we can report which commits fail the check.
2017-02-08 03:42:08 +01:00
Leo Famulari 69355e1283
doc: Add a Git hook that verifies signatures before pushing.
* HACKING (Commit Access): Describe the pre-push Git hook.
* etc/git/pre-push: New file.
2017-01-04 16:27:20 -05:00