summaryrefslogtreecommitdiff
path: root/etc/git
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim@guixotic.coop>2026-03-21 12:05:54 +0900
committerMaxim Cournoyer <maxim@guixotic.coop>2026-03-24 08:53:50 +0900
commit83dfc5475d011095dcded8a4e9a30a1cd1ded34b (patch)
treeeb9f0391b1c12b850309aee8237df0b2701c2ebf /etc/git
parentbb22f6dd835e3a8df5e315229937bd9265f9760d (diff)
etc: Ensure guix.authenticate section is populated in post-merge hook.
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>
Diffstat (limited to 'etc/git')
-rwxr-xr-xetc/git/post-merge8
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/git/post-merge b/etc/git/post-merge
index f2ad37d35c4..9f116dd3e9c 100755
--- a/etc/git/post-merge
+++ b/etc/git/post-merge
@@ -1,3 +1,9 @@
#!/bin/sh
# Authenticate the repo upon 'git pull' and similar.
-exec guix git authenticate
+if ! git config guix.authentication.introduction-commit; then
+ exec guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \
+ "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" \
+ -k origin/keyring
+else
+ exec guix git authenticate
+fi