File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2525# or if rebase is forced via command line option
2626if [ -n " $rebase " ]; then
2727 zz_log i " Rebase forced via command line option, will rebase commits onto hotfix branch"
28- elif git log " $main " ..HEAD --pretty=%B | grep -E ' ^[a-zA-Z] ' | grep -vE " $main |^fix(\(.+\))?:" > /dev/null; then
28+ elif git log --reverse --pretty=oneline --format= %B develop --not origin/develop --no-merges | grep -vE " ^$ |^fix(\(.+\))?:" > /dev/null; then
2929 zz_log w " There are commits since $main that are not of type 'fix:', creating hotfix branch only"
3030 unset rebase
3131elif [ -z " $stash " ]; then
@@ -62,7 +62,7 @@ GIT_EDITOR=:
6262hotfix=$( echo " $main " | sed -E ' s/([0-9]+)\.([0-9]+)\.([0-9]+)/\1.\2.X/' )
6363
6464# Create hotfix branch
65- git flow hotfix start $current
65+ git flow hotfix start $hotfix
6666
6767# If stash was used, pop it back
6868if [ -n " $stash " ]; then
You can’t perform that action at this time.
0 commit comments