diff options
| author | Maxim Cournoyer <maxim@guixotic.coop> | 2026-03-21 12:05:54 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2026-03-24 08:53:50 +0900 |
| commit | 83dfc5475d011095dcded8a4e9a30a1cd1ded34b (patch) | |
| tree | eb9f0391b1c12b850309aee8237df0b2701c2ebf /etc/git | |
| parent | bb22f6dd835e3a8df5e315229937bd9265f9760d (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-x | etc/git/post-merge | 8 |
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 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | # Authenticate the repo upon 'git pull' and similar. | 2 | # Authenticate the repo upon 'git pull' and similar. |
| 3 | exec guix git authenticate | 3 | if ! git config guix.authentication.introduction-commit; then |
| 4 | exec guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \ | ||
| 5 | "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA" \ | ||
| 6 | -k origin/keyring | ||
| 7 | else | ||
| 8 | exec guix git authenticate | ||
| 9 | fi | ||