2 files changed, 6 insertions, 1 deletions

diff --git a/etc/git/post-merge b/etc/git/post-merge
new file mode 100755
index 00000000000..f2ad37d35c4
--- /dev/null
+++ b/etc/git/post-merge
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Authenticate the repo upon 'git pull' and similar.
+exec guix git authenticate
diff --git a/etc/git/pre-push b/etc/git/pre-push
index 59671b0d583..325b23854bb 100755
--- a/etc/git/pre-push
+++ b/etc/git/pre-push
@@ -32,7 +32,9 @@ do
                 # Only use the hook when pushing to Savannah.
                 case "$2" in
                     *.gnu.org*)
-                        exec make authenticate check-channel-news
+                        set -e
+                        make check-channel-news
+                        exec guix git authenticate
                         exit 127
                         ;;
                     *)