From c4d06691c04c569e163b771b99734bfcadac39fd Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Wed, 24 Aug 2022 15:59:47 -0400
Subject: [PATCH] git-arc: Respect GIT_EDITOR and GIT_PAGER

---
 tools/tools/git/git-arc.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/tools/git/git-arc.sh b/tools/tools/git/git-arc.sh
index ab12b887c89d..22a13aa307bd 100644
--- a/tools/tools/git/git-arc.sh
+++ b/tools/tools/git/git-arc.sh
@@ -575,6 +575,16 @@ USAGE=
 # shellcheck disable=SC1090
 . "$git_sh_setup"
 
+# git commands use GIT_EDITOR instead of EDITOR, so try to provide consistent
+# behaviour.  Ditto for PAGER.  This makes git-arc play nicer with editor
+# plugins like vim-fugitive.
+if [ -n "$GIT_EDITOR" ]; then
+    EDITOR=$GIT_EDITOR
+fi
+if [ -n "$GIT_PAGER" ]; then
+    PAGER=$GIT_PAGER
+fi
+
 # Bail if the working tree is unclean, except for "list" and "patch"
 # operations.
 case $verb in