diff --git a/etc/git/pre-push b/etc/git/pre-push index 998df45e6d..9ce3dd4cb7 100755 --- a/etc/git/pre-push +++ b/etc/git/pre-push @@ -38,11 +38,17 @@ do # and thus there are no signatures or news updates to be verified. if [ "$local_hash" != $z40 ] then - # Skip the hook when performing a pull-request. + # Skip the hook when performing a pull-request... case "$remote_ref" in refs/for/*) exit 0 ;; + # ... or when pushing a new PGP key to the keyring branch, + # as this branch doesn't share ancestry with the master + # branch and fails the 'guix git authenticate' check. + refs/heads/keyring) + exit 0 + ;; esac # Only perform checks when pushing to upstream.