From adf91732a859b4f7f720f7854a5482d2b76d60a7 Mon Sep 17 00:00:00 2001
From: Danielle McLean <dani@00dani.me>
Date: Thu, 10 Aug 2017 11:13:58 +1000
Subject: [PATCH] Migrate gpg wrapper from using gpg2 to just gpg, because
 GnuPG 2.1.23 removes the 'gpg2' alias

---
 config/git/config                                       | 2 +-
 local/bin/{gpg2-for-git-signing => gpg-for-git-signing} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename local/bin/{gpg2-for-git-signing => gpg-for-git-signing} (92%)

diff --git a/config/git/config b/config/git/config
index 6849057..affb628 100644
--- a/config/git/config
+++ b/config/git/config
@@ -22,7 +22,7 @@
 	arguments = --preserve-merges
 
 [gpg]
-	program = gpg2-for-git-signing
+	program = gpg-for-git-signing
 
 [rerere]
 	enabled = true
diff --git a/local/bin/gpg2-for-git-signing b/local/bin/gpg-for-git-signing
similarity index 92%
rename from local/bin/gpg2-for-git-signing
rename to local/bin/gpg-for-git-signing
index 59bb18d..3c7b766 100755
--- a/local/bin/gpg2-for-git-signing
+++ b/local/bin/gpg-for-git-signing
@@ -10,4 +10,4 @@ for arg; do
 		args+=($arg)
 	fi
 done
-exec gpg2 --no-tty "${(@)args}"
+exec gpg --no-tty "${(@)args}"