Add support of custom base branch name for 'git release'

andyone · Jul 10, 2024 · 6050700 · 6050700
1 parent 377087c
commit 6050700
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.zshrc b/.zshrc
@@ -227,12 +227,14 @@ function git_release() {
     return 0
   fi
 
-  if [[ $(\git rev-parse --abbrev-ref HEAD 2>/dev/null) != "master" ]] ; then
+  local defBranch=$(\git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
+
+  if [[ $(\git rev-parse --abbrev-ref HEAD 2>/dev/null) != "$defBranch" ]] ; then
     if ! \git push ; then
       return 1
     fi
 
-    if ! \git checkout master ; then
+    if ! \git checkout "$defBranch" ; then
       return 1
     fi
   fi

diff --git a/install.sh b/install.sh
@@ -7,7 +7,7 @@ set -e
 
 ################################################################################
 
-VERSION="2.4.6"
+VERSION="2.4.7"
 
 ################################################################################