Merge branch 'feature/compliance' into develop
diff --git a/git-flow-hotfix b/git-flow-hotfix
index 9e71374..3926e40 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -112,12 +112,21 @@
fi
}
+require_no_existing_hotfix_branches() {
+ local hotfix_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
+ local first_branch=$(echo ${hotfix_branches} | head -n1)
+ first_branch=${first_branch#$PREFIX}
+ [ -z "$hotfix_branches" ] || \
+ die "There is an existing hotfix branch ($first_branch). Finish that one first."
+}
+
cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
BASE=${2:-$MASTER_BRANCH}
require_version_arg
require_base_is_on_master
+ require_no_existing_hotfix_branches
# sanity checks
gitflow_require_clean_working_tree
diff --git a/git-flow-release b/git-flow-release
index 329a5e1..b56c54d 100644
--- a/git-flow-release
+++ b/git-flow-release
@@ -118,12 +118,21 @@
fi
}
+require_no_existing_release_branches() {
+ local release_branches=$(echo "$LOCAL_BRANCHES" | grep "^$PREFIX")
+ local first_branch=$(echo ${release_branches} | head -n1)
+ first_branch=${first_branch#$PREFIX}
+ [ -z "$release_branches" ] || \
+ die "There is an existing release branch ($first_branch). Finish that one first."
+}
+
cmd_start() {
DEFINE_boolean fetch true "fetch from $ORIGIN before performing finish" F
parse_args "$@"
BASE=${2:-$DEVELOP_BRANCH}
require_version_arg
require_base_is_on_develop
+ require_no_existing_release_branches
# sanity checks
gitflow_require_clean_working_tree