From 9b1f38e7b0cd0a9a95fae7e4b9d98e4bd47e2ff8 Mon Sep 17 00:00:00 2001
From: Justin Kumpe <jakumpe@kumpeapps.com>
Date: Tue, 6 Jan 2026 23:32:31 +0000
Subject: [PATCH] [bugfix/git_helper-20] Fixed Git Switch

---
 git_helpers/git-helper.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/git_helpers/git-helper.sh b/git_helpers/git-helper.sh
index 01ac25e..8da834b 100755
--- a/git_helpers/git-helper.sh
+++ b/git_helpers/git-helper.sh
@@ -5,7 +5,7 @@ set -euo pipefail
 # If neither is available, fall back to a text-based menu.
 
 # Version information
-SCRIPT_VERSION="1.0.1"
+SCRIPT_VERSION="1.0.2"
 GITHUB_REPO="kumpeapps/helper_scripts"
 
 # Resolve the on-disk path to this script (without relying on realpath availability)
@@ -25,9 +25,9 @@ script_self_path() {
 # Global state
 UI_TOOL=""
 TITLE="Git Helper v${SCRIPT_VERSION}"
-HEIGHT=20
-WIDTH=78
-MENU_HEIGHT=12
+HEIGHT=12
+WIDTH=70
+MENU_HEIGHT=15
 default_config_dir="${XDG_CONFIG_HOME:-$HOME/.config}"
 CONFIG_DIR="$default_config_dir/git-helper"
 NEVER_INSTALL_FILE="$CONFIG_DIR/never-install-ui"
@@ -933,7 +933,10 @@ cmd_branch_switch() {
   b=$(pick_branch)
   [[ -z "$b" ]] && return
   if [[ "$b" == */* ]]; then
-    run_and_show "Switch to $b" git checkout --track "$b"
+    # Extract remote and branch name (e.g., origin/feature/acew-1)
+    local remote_name="${b%%/*}"  # Get remote name (e.g., origin)
+    local branch_name="${b#*/}"   # Get branch name after remote (e.g., feature/acew-1)
+    run_and_show "Switch to $b" git checkout --track -b "$branch_name" "$b"
   else
     run_and_show "Switch to $b" git checkout "$b"
   fi