Added -k option to keep (feature|hotfix|relase) branch when calling 'finish'.
diff --git a/git-flow-hotfix b/git-flow-hotfix
index 84b2ac5..a05c4aa 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -45,7 +45,7 @@
usage() {
echo "usage: git flow hotfix [list] [-v]"
echo " git flow hotfix start [-F] <version> [<base>]"
- echo " git flow hotfix finish [-Fsump] <version>"
+ echo " git flow hotfix finish [-Fsumpk] <version>"
}
cmd_default() {
@@ -124,7 +124,7 @@
eval set -- "${FLAGS_ARGV}"
# read arguments into global variables
- VERSION=$1
+ VERSION=${!#}
BRANCH=$PREFIX$VERSION
}
@@ -194,6 +194,7 @@
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u
DEFINE_string message "" "use the given tag message" m
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
+ DEFINE_boolean keep false 'keep branch after performing finish' k
parse_args "$@"
require_version_arg
@@ -257,7 +258,11 @@
fi
# delete branch
- git branch -d "$BRANCH"
+ if flag keep; then
+ echo "Keep this branch" > /dev/null
+ else
+ git branch -d "$BRANCH"
+ fi
if flag push; then
git push "$ORIGIN" "$DEVELOP_BRANCH" || \
@@ -274,7 +279,11 @@
echo "- Hotfix branch has been merged into '$MASTER_BRANCH'"
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
- echo "- Hotfix branch '$BRANCH' has been deleted"
+ if flag keep; then
+ echo "- Hotfix branch '$BRANCH' has been kept"
+ else
+ echo "- Hotfix branch '$BRANCH' has been deleted"
+ fi
if flag push; then
echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'"
fi