Commit b22a0764 authored by Benedikt Böhm's avatar Benedikt Böhm Committed by Vincent Driessen

make version tag prefix configurable so one can use it for github semver.org compliance

parent c51aedf8
...@@ -29,6 +29,7 @@ usage() { ...@@ -29,6 +29,7 @@ usage() {
} }
parse_args() { parse_args() {
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
VERSION="$1" VERSION="$1"
if [ "$VERSION" = "" ]; then if [ "$VERSION" = "" ]; then
echo "Missing argument <version>." echo "Missing argument <version>."
...@@ -82,7 +83,7 @@ cmd_finish() { ...@@ -82,7 +83,7 @@ cmd_finish() {
# merge into master # merge into master
git checkout $MASTER_BRANCH git checkout $MASTER_BRANCH
git merge --no-ff $BRANCH git merge --no-ff $BRANCH
git tag $VERSION git tag $VERSION_PREFIX$VERSION
# merge into develop # merge into develop
git checkout $DEVELOP_BRANCH git checkout $DEVELOP_BRANCH
......
...@@ -17,8 +17,9 @@ usage() { ...@@ -17,8 +17,9 @@ usage() {
} }
parse_args() { parse_args() {
VERSION_PREFIX=$(git config --get gitflow.prefix.versiontag)
VERSION="$1" VERSION="$1"
BASE="${2:-${VERSION}}" BASE="${2:-${VERSION_PREFIX}${VERSION}}"
if [ "$VERSION" = "" ]; then if [ "$VERSION" = "" ]; then
echo "Missing argument <version>." echo "Missing argument <version>."
usage usage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment