Skip to content
Browse files

Tidy up a bit.

  • Loading branch information...
1 parent 3ef45cd commit ddd9dfe9880dd8e25150c0016d878022ad35631a @nvie committed Oct 5, 2010
Showing with 10 additions and 16 deletions.
  1. +4 −6 git-flow-feature
  2. +3 −5 git-flow-hotfix
  3. +3 −5 git-flow-release
View
10 git-flow-feature
@@ -231,8 +231,8 @@ cmd_start() {
cmd_finish() {
DEFINE_boolean fetch false "fetch from $ORIGIN before performing finish" F
- DEFINE_boolean rebase false 'rebase instead of merge' r
- DEFINE_boolean keep false 'keep branch after performing finish' k
+ DEFINE_boolean rebase false "rebase instead of merge" r
+ DEFINE_boolean keep false "keep branch after performing finish" k
parse_args "$@"
expand_nameprefix_arg
@@ -346,9 +346,7 @@ helper_finish_cleanup() {
fi
- if flag keep; then
- echo "Keep this branch" > /dev/null
- else
+ if noflag keep; then
git branch -d "$BRANCH"
fi
@@ -357,7 +355,7 @@ helper_finish_cleanup() {
echo "- The feature branch '$BRANCH' was merged into '$DEVELOP_BRANCH'"
#echo "- Merge conflicts were resolved" # TODO: Add this line when it's supported
if flag keep; then
- echo "- Feature branch '$BRANCH' has been kept"
+ echo "- Feature branch '$BRANCH' is still available"
else
echo "- Feature branch '$BRANCH' has been removed"
fi
View
8 git-flow-hotfix
@@ -194,7 +194,7 @@ cmd_finish() {
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
+ DEFINE_boolean keep false "keep branch after performing finish" k
parse_args "$@"
require_version_arg
@@ -258,9 +258,7 @@ cmd_finish() {
fi
# delete branch
- if flag keep; then
- echo "Keep this branch" > /dev/null
- else
+ if noflag keep; then
git branch -d "$BRANCH"
fi
@@ -280,7 +278,7 @@ cmd_finish() {
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
if flag keep; then
- echo "- Hotfix branch '$BRANCH' has been kept"
+ echo "- Hotfix branch '$BRANCH' is still available"
else
echo "- Hotfix branch '$BRANCH' has been deleted"
fi
View
8 git-flow-release
@@ -197,7 +197,7 @@ cmd_finish() {
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
+ DEFINE_boolean keep false "keep branch after performing finish" k
parse_args "$@"
require_version_arg
@@ -263,9 +263,7 @@ cmd_finish() {
fi
# delete branch
- if flag keep; then
- echo "Keep this branch" > /dev/null
- else
+ if noflag keep; then
git branch -d "$BRANCH"
fi
@@ -287,7 +285,7 @@ cmd_finish() {
echo "- The release was tagged '$tagname'"
echo "- Release branch has been back-merged into '$DEVELOP_BRANCH'"
if flag keep; then
- echo "- Release branch '$BRANCH' has been kept"
+ echo "- Release branch '$BRANCH' is still available"
else
echo "- Release branch '$BRANCH' has been deleted"
fi

0 comments on commit ddd9dfe

Please sign in to comment.
Something went wrong with that request. Please try again.