From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 58813@debbugs.gnu.org
Cc: ludo@gnu.org, liliana.prikler@gmail.com,
Maxim Cournoyer <maxim.cournoyer@gmail.com>,
zimon.toutoune@gmail.com
Subject: bug#58813: [PATCH v2 3/5] Makefile.am: Auto-configure Git on 'make'.
Date: Sun, 23 Apr 2023 22:29:25 -0400 [thread overview]
Message-ID: <db3b756301c2b7f228bd7080d20b0ef9a30ea4a9.1682303142.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <5b9af4fa77a89c6a4b169dc464f414b1a4166d60.camel@gmail.com>
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.
---
Makefile.am | 10 ++++++++++
etc/git/gitconfig | 15 +++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/Makefile.am b/Makefile.am
index 23b939b674..7daa7d66f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,7 @@
# Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
# Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
# Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+# Copyright © 2020, 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
# Copyright © 2021 Chris Marusich <cmmarusich@gmail.com>
# Copyright © 2021 Andrew Tropin <andrew@trop.in>
#
@@ -1109,6 +1110,15 @@ cuirass-jobs: $(GOBJECTS)
.PHONY: clean-go make-go as-derivation authenticate
.PHONY: update-guix-package update-NEWS cuirass-jobs release
+# Git auto-configuration.
+.git/hooks/pre-push: etc/git/pre-push
+ cp etc/git/pre-push .git/hooks/pre-push
+
+.git/config: etc/git/gitconfig
+ git config include.path ../etc/git/gitconfig
+
+nodist_noinst_DATA = .git/hooks/pre-push .git/config
+
# Downloading up-to-date PO files.
WEBLATE_REPO = https://framagit.org/tyreunom/guix-translations
diff --git a/etc/git/gitconfig b/etc/git/gitconfig
index c9ebdc8fa8..0b6984a05f 100644
--- a/etc/git/gitconfig
+++ b/etc/git/gitconfig
@@ -1,5 +1,20 @@
+[commit]
+ gpgsign = true
+
[diff "scheme"]
xfuncname = "^(\\(define.*)$"
[diff "texinfo"]
xfuncname = "^@node[[:space:]]+([^,]+).*$"
+
+[format]
+ useAutoBase = true
+ thread = shallow
+
+[pull]
+ rebase = true
+
+[sendemail]
+ to = guix-patches@gnu.org
+ headerCmd = etc/teams.scm cc-members-header-cmd
+ thread = no
--
2.39.2
next prev parent reply other threads:[~2023-04-24 2:30 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-27 3:50 bug#58813: can't substitute etc/teams.scm command as doc suggests Maxim Cournoyer
2022-10-27 6:08 ` Liliana Marie Prikler
2022-10-27 12:40 ` Maxim Cournoyer
2022-10-27 16:27 ` Liliana Marie Prikler
2023-02-26 3:55 ` bug#58813: [PATCH] doc: Document how to use Patman for patches submission Maxim Cournoyer
2023-02-26 8:25 ` Liliana Marie Prikler
2023-02-26 17:11 ` Maxim Cournoyer
2023-02-27 0:45 ` Tobias Geerinckx-Rice via Bug reports for GNU Guix
2023-02-27 16:43 ` Maxim Cournoyer
2023-03-03 9:54 ` Ludovic Courtès
2023-03-03 17:26 ` Liliana Marie Prikler
2023-03-06 14:53 ` bug#58813: ‘guix style’ flaws Ludovic Courtès
2023-03-06 17:42 ` Maxim Cournoyer
2023-03-07 1:07 ` bug#58813: [PATCH] doc: Document how to use Patman for patches submission Maxim Cournoyer
2023-03-10 9:01 ` Ludovic Courtès
2023-03-10 14:07 ` Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 0/5] Fix teams.scm by use of a new --header-cmd git send-email option Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 1/5] gnu: git: Apply patch adding the --header-cmd feature Maxim Cournoyer
2023-04-23 17:00 ` Liliana Marie Prikler
2023-04-24 0:46 ` Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 2/5] teams: Add 'cc-members-header-cmd' action Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 3/5] teams: Add a configure-git action Maxim Cournoyer
2023-04-23 17:03 ` Liliana Marie Prikler
2023-04-24 0:59 ` Maxim Cournoyer
2023-04-24 2:29 ` bug#58813: [PATCH v2 0/5] Fix teams.scm by use of a new --header-cmd git send-email option Maxim Cournoyer
2023-04-24 2:29 ` bug#58813: [PATCH v2 1/5] gnu: git: Apply patch adding the --header-cmd feature Maxim Cournoyer
2023-04-24 2:29 ` bug#58813: [PATCH v2 2/5] teams: Add 'cc-members-header-cmd' action Maxim Cournoyer
2023-04-24 2:29 ` Maxim Cournoyer [this message]
2023-04-24 4:22 ` bug#58813: [PATCH v2 3/5] Makefile.am: Auto-configure Git on 'make' Liliana Marie Prikler
2023-04-24 12:37 ` Maxim Cournoyer
2023-04-28 14:28 ` Josselin Poiret via Bug reports for GNU Guix
2023-05-01 16:38 ` bug#58813: can't substitute etc/teams.scm command as doc suggests Maxim Cournoyer
2023-04-24 2:29 ` bug#58813: [PATCH v2 4/5] teams: Add a 'cc-mentors-header-cmd' action Maxim Cournoyer
2023-04-24 2:29 ` bug#58813: [PATCH v2 5/5] doc: Simplify contributing section by automating git configuration Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 4/5] teams: Add a 'cc-mentors-header-cmd' action Maxim Cournoyer
2023-04-23 16:04 ` bug#58813: [PATCH 5/5] doc: Simplify contributing section by automating git configuration Maxim Cournoyer
2023-03-07 11:35 ` bug#58813: [PATCH v2] doc: Document how to use Patman for patches submission Simon Tournier
2023-03-07 16:46 ` Maxim Cournoyer
2023-03-07 17:39 ` Simon Tournier
2023-03-08 5:29 ` Liliana Marie Prikler
2023-03-08 8:47 ` Simon Tournier
2023-03-08 16:26 ` Maxim Cournoyer
2023-03-08 17:05 ` Simon Tournier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db3b756301c2b7f228bd7080d20b0ef9a30ea4a9.1682303142.git.maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=58813@debbugs.gnu.org \
--cc=liliana.prikler@gmail.com \
--cc=ludo@gnu.org \
--cc=zimon.toutoune@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).