Fix: respect the VERSION_PREFIX in hotfix releases, too.
This commit is contained in:
parent
48386441c8
commit
57e7bde9b8
1 changed files with 3 additions and 2 deletions
|
@ -12,6 +12,7 @@
|
||||||
# Copyright (c) 2010 by Benedikt Böhm
|
# Copyright (c) 2010 by Benedikt Böhm
|
||||||
#
|
#
|
||||||
|
|
||||||
|
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
|
||||||
PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
|
PREFIX=$(git config --get gitflow.prefix.hotfix || echo hotfix/)
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
|
@ -98,7 +99,7 @@ cmd_finish() {
|
||||||
# merge into BASE
|
# merge into BASE
|
||||||
git checkout $BASE
|
git checkout $BASE
|
||||||
git merge --no-ff $BRANCH
|
git merge --no-ff $BRANCH
|
||||||
git tag v$VERSION
|
git tag $VERSION_PREFIX$VERSION
|
||||||
|
|
||||||
# merge into develop if we fixed a master issue
|
# merge into develop if we fixed a master issue
|
||||||
# TODO: merge into support branch
|
# TODO: merge into support branch
|
||||||
|
@ -117,7 +118,7 @@ cmd_finish() {
|
||||||
echo "Summary of actions:"
|
echo "Summary of actions:"
|
||||||
echo "- Latest objects have been fetched from '$ORIGIN'"
|
echo "- Latest objects have been fetched from '$ORIGIN'"
|
||||||
echo "- Hotfix branch has been merged into '$BASE'"
|
echo "- Hotfix branch has been merged into '$BASE'"
|
||||||
echo "- The hotfix was tagged 'v$VERSION'"
|
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
|
||||||
if [ "$BASE" = "$MASTER_BRANCH" ]; then
|
if [ "$BASE" = "$MASTER_BRANCH" ]; then
|
||||||
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
|
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue