From 48ef0a52d1c1dd20585f977a22bd9f0a68232e98 Mon Sep 17 00:00:00 2001
From: Benedikt Heine <bebe@bebehei.de>
Date: Thu, 4 Dec 2025 16:28:57 +0100
Subject: [PATCH] Fix hard coded master/main branch on git-ard

As previous change, but now for git-ard, too
---
 bin/git-ard.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/bin/git-ard.sh b/bin/git-ard.sh
index a1d5311..1d11cb5 100755
--- a/bin/git-ard.sh
+++ b/bin/git-ard.sh
@@ -5,19 +5,12 @@
 # Enforce being in a git repository
 git rev-parse --is-inside-work-tree >/dev/null || exit $?
 
-# We actually should check out the head branch via `git remote show ${REMOTE}`,
-# but this requires active connection and active 2FA verification. Tedious to
-# have multiple calls for this
-if git rev-parse --verify main &>/dev/null; then
-    MAIN_BRANCH=main
-else
-    MAIN_BRANCH=master
-fi
-
-CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 GIT_REMOTE=origin
 
+HEAD_REMOT="$(git rev-parse --abbrev-ref ${GIT_REMOTE}/HEAD | cut -d/ -f2)"
+HEAD_LOCAL="$(git rev-parse --abbrev-ref               HEAD)"
+
 # Show the next command
 set -x
 
-git range-diff "${GIT_REMOTE}/${MAIN_BRANCH}..${GIT_REMOTE}/${CURRENT_BRANCH}" "${MAIN_BRANCH}..${CURRENT_BRANCH}"
+git range-diff "${GIT_REMOTE}/${HEAD_REMOT}..${GIT_REMOTE}/${HEAD_LOCAL}" "${HEAD_REMOT}..${HEAD_LOCAL}"