From 97fca993a3d1393c549fb52492b1b97a1c17d5e1 Mon Sep 17 00:00:00 2001
From: tiyn <tiyn@posteo.eu>
Date: Sun, 16 Nov 2025 09:59:37 +0100
Subject: [PATCH] zsh: master<->main widget now goes both ways

---
 .config/zsh/.zshrc | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 43afa32..dc0f990 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -85,21 +85,28 @@ function +vi-git-stash() {
 # CUSTOM WIDGETS #
 ##################
 
-_git_fix_master_main() {
+_git_fix_main_master() {
   if [[ $BUFFER == git\ * ]]; then
-    if [[ $BUFFER == *" master"* ]]; then
-      if git rev-parse --verify main >/dev/null 2>&1 \
-        && ! git rev-parse --verify master >/dev/null 2>&1; then
+    local has_main=0
+    local has_master=0
+    git rev-parse --verify main >/dev/null 2>&1   && has_main=1
+    git rev-parse --verify master >/dev/null 2>&1 && has_master=1
+    if [[ $has_main -eq 1 && $has_master -eq 0 ]]; then
+      if [[ $BUFFER == *" master"* ]]; then
         BUFFER=${BUFFER//" master"/" main"}
       fi
     fi
+    if [[ $has_master -eq 1 && $has_main -eq 0 ]]; then
+      if [[ $BUFFER == *" main"* ]]; then
+        BUFFER=${BUFFER//" main"/" master"}
+      fi
+    fi
   fi
   zle accept-line
 }
 
-zle -N _git_fix_master_main
-
-bindkey "^M" _git_fix_master_main
+zle -N _git_fix_main_master
+bindkey "^M" _git_fix_main_master
 
 #########
 # STYLE #