fix(gitutils): 🐛 update version retrieval

Author: tomgrv

src/gitutils/_git-release-beta.sh

@@ -10,7 +10,7 @@ if [ -f .git/RELEASE ] && [ -n "$(git branch --list release/* | grep -v $(cat .g
 fi
 
 #### GET BUMP VERSION
-GBV=$(gitversion -config .gitversion -showvariable MajorMinorPatch | tee .git/RELEASE)
+GBV=$(gv -showvariable MajorMinorPatch | tee .git/RELEASE)
 
 #### PREVENT GIT EDITOR PROMPT
 GIT_EDITOR=:

src/gitutils/_git-release-hotfix.sh

@@ -3,17 +3,23 @@
 #### Goto repository root
 cd "$(git rev-parse --show-toplevel)" >/dev/null
 
-#### GET last vX.Y.Z tag on the main branch
-last=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" main | sed 's/^v//')
+# Parse arguments and print help if needed
+eval $(
+    zz_args "Create HotFix branch" $0 "$@" <<-help
+help
+)
+
+#### GET last vX.Y.Z tag on the main branch, removing the leading 'v' and replacing last number with 'X'
+current=$(git describe --tags --abbrev=0 --match "v[0-9]*.[0-9]*.[0-9]*" main | sed -e 's/^v//' -e 's/\.[0-9]*$/.X/')
 
 #### SAVE CURRENT STATUS
-git stash save --include-untracked "Before hotfix/$last"
+git stash --include-untracked --message "Before $current" --keep-index   
 
 #### PREVENT GIT EDITOR PROMPT
 GIT_EDITOR=:
 
 #### START HOTFIX
-git flow hotfix start $last
+git flow hotfix start $current
 
 #### RESTORE STATUS
 git stash apply

src/gitutils/_git-release-prod.sh

@@ -44,7 +44,7 @@ fi
 zz_log s "On branch: {Blue $flow/$name}"
 
 # Get the new version from gitversion
-GBV=$(gitversion -config .gitversion -showvariable MajorMinorPatch)
+GBV=$(gv -showvariable MajorMinorPatch)
 if [ -z "$GBV" ]; then
     zz_log e "Cannot get version from .gitversion"
     exit 1