felix/dotfiles
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/dotfiles.git synced 2026-01-29 01:13:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix hard coded master/main branch on git-ard
Some checks are pending
Build / Lint Code Base (push) Waiting to run
Details
CI / build (push) Waiting to run
Details

Browse source 
As previous change, but now for git-ard, too
This commit is contained in:
Benedikt Heine 2025-12-04 16:28:57 +01:00 • committed by Felix Buehler
parent 837517dad7
commit 48ef0a52d1
1 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bin/git-ard.sh
View file

@ -5,19 +5,12 @@
# Enforce being in a git repository # Enforce being in a git repository
git rev-parse --is-inside-work-tree >/dev/null || exit $? 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 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 # Show the next command
set -x 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}"