From 8d1c970031d1d1f158ed3a57b34027ef8240cceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20Fern=C3=A1ndez=20Serrata?=
 <76864299+Rudxain@users.noreply.github.com>
Date: Tue, 14 Apr 2026 01:26:28 -0400
Subject: [PATCH] refactor(abort): common `gitdir` (#1244)

* refactor(abort): common gitdir

* un-readonly
---
 bin/git-abort | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/bin/git-abort b/bin/git-abort
index 36c0c9a..19b544a 100755
--- a/bin/git-abort
+++ b/bin/git-abort
@@ -2,10 +2,10 @@
 
 set -euo pipefail
 
+# git rev-parse emits an error if not in a git repo so only need to bail out
+gitdir="$(git rev-parse --git-dir)" || exit
+
 discover_op() {
-  local gitdir
-  # git rev-parse emits an error if not in a git repo so only need to bail out
-  gitdir="$(git rev-parse --git-dir)" || exit
   local op
   for op in cherry_pick merge rebase revert ; do
       if [ -f "${gitdir}/${op^^}_HEAD" ]; then
@@ -22,7 +22,6 @@ validate_op() {
   fi
   if [[ "$(echo "$op" | wc -l)" -gt 1 ]]; then
     echo "Multiple active operations found:" >&2
-    gitdir="$(git rev-parse --git-dir)" || exit
     for o in $op; do
       echo "  - $o: HEAD: $(cat "${gitdir}/${o}_HEAD")" >&2
     done