fix(gitutils): 🐛 add stash option to handle uncommitted changes before hotfix

Author: tomgrv

src/gitutils/_git-fix-base.sh

@@ -4,7 +4,8 @@
 eval $(
 	zz_args "Fix git base - rebase commits from one branch to another" $0 "$@" <<-help
 		    p -      push     force push changes to remote
-		    d -      dryrun   show what would be done without making changes
+		    n -      dry-run   show what would be done without making changes
+		    - source source    source branch to take commits from (default: current branch)
 		    - target target    target branch to rebase commits onto
 		    - source source    source branch to take commits from (default: current branch)
 	help
@@ -176,8 +177,8 @@ else
 	zz_log i "Staying on '$target' branch"
 fi
 
-# Push changes if force flag is set
-if [ -n "$force" ]; then
+# Push changes if push flag is set
+if [ -n "$push" ]; then
 	zz_log i "Pushing changes to remote..."
 
 	# Push source branch (reset)

src/gitutils/_git-release-hotfix.sh

@@ -7,6 +7,7 @@ cd "$(git rev-parse --show-toplevel)" >/dev/null
 eval $(
     zz_args "Create HotFix branch" $0 "$@" <<-help
         r -         rebase      force rebase of current commits onto hotfix branch
+        s -         stash       stash current staged changes before creating hotfix branch and reapply them after
 help
 )
 
@@ -24,11 +25,11 @@ fi
 # or if rebase is forced via command line option
 if [ -n "$rebase" ]; then
     zz_log i "Rebase forced via command line option, will rebase commits onto hotfix branch"
-elif git log  --all --ancestry-path --pretty=format:%s "$main"..HEAD | grep -vE "^(fix(\(.+\))?:|Merge)" >/dev/null; then
+elif git log "$main"..HEAD --pretty=%B | grep -E '^[a-zA-Z]' | grep -vE "$main|^fix(\(.+\))?:" >/dev/null; then
     zz_log w "There are commits since $main that are not of type 'fix:', creating hotfix branch only"
     unset rebase
 elif [ -z "$stash" ]; then
-    zz_log i "All commits since $main are of type 'fix:', creating hotfix branch and rebasing current history onto it"
+    zz_log i "All commits since $main are of type 'fix:', creating hotfix branch and rebasing current history + stash on top of it"
     rebase=true
 fi
 
@@ -42,22 +43,45 @@ fi
 
 # Ensure working directory is clean
 if [ -n "$(git status --porcelain)" ]; then
-    zz_log e "Working directory is not clean. Please commit or stash changes."
-    exit 1
+
+    if [ -n "$stash" ]; then
+        zz_log w "Working directory is not clean. Stashing staged changes before creating hotfix branch..."
+        git stash save -k -m "Hotfix stash: $(date +%Y-%m-%d-%H-%M-%S)"
+    else
+        zz_log e "Working directory is not clean. Please commit or stash changes. Use -s option to automatically stash and reapply changes."
+        exit 1
+    fi
+else
+    zz_log i "Working directory is clean, no need to stash changes"
+    unset stash
 fi
 
-#### PREVENT GIT EDITOR PROMPT
+# Set GIT_EDITOR to no-op to avoid opening editor during rebase or cherry-pick
 GIT_EDITOR=:
 
 hotfix=$(echo "$main" | sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/')
 
-#### START HOTFIX
-git flow hotfix start $hotfix
+# Create hotfix branch
+git flow hotfix start $current
 
-#### RESTORE STATUS AND HANDLE REBASE
+# If stash was used, pop it back
+if [ -n "$stash" ]; then
+    zz_log i "Applying stashed changes..."
+    git stash pop --index
+fi
+
+# If rebase needed, 
+# pick all "fix" commits from develop branch and rebase them onto hotfix branch,
+# then reset develop branch to the main tag
 if [ -n "$rebase" ]; then
 
-    zz_log i "Rebasing develop commits onto hotfix branch..."
-    git fix base -p hotfix/$hotfix
+    zz_log i "Rebasing: inverting develop and hotfix branches..."
+
+    git fix base -p develop hotfix/"$current"
+    
+    # Return to hotfix branch
+    git checkout "hotfix/$current"
+    
+    zz_log s "Successfully inverted develop and hotfix branches"
 fi