Commit ddba2df9 authored by Vincent Driessen's avatar Vincent Driessen

Fix spacing issues.

parent 6809f0e4
...@@ -159,7 +159,7 @@ cmd_finish() { ...@@ -159,7 +159,7 @@ cmd_finish() {
DEFINE_boolean sign false "sign the release tag cryptographically" s DEFINE_boolean sign false "sign the release tag cryptographically" s
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u 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_string message "" "use the given tag message" m
DEFINE_boolean push false "push to $ORIGIN after performing finish" p DEFINE_boolean push false "push to $ORIGIN after performing finish" p
parse_args "$@" parse_args "$@"
require_version_arg require_version_arg
...@@ -221,14 +221,14 @@ cmd_finish() { ...@@ -221,14 +221,14 @@ cmd_finish() {
# delete branch # delete branch
git branch -d "$BRANCH" git branch -d "$BRANCH"
if flag push; then if flag push; then
git push "$ORIGIN" "$DEVELOP_BRANCH" || \ git push "$ORIGIN" "$DEVELOP_BRANCH" || \
die "Could not push to $DEVELOP_BRANCH from $ORIGIN." die "Could not push to $DEVELOP_BRANCH from $ORIGIN."
git push "$ORIGIN" "$MASTER_BRANCH" || \ git push "$ORIGIN" "$MASTER_BRANCH" || \
die "Could not push to $MASTER_BRANCH from $ORIGIN." die "Could not push to $MASTER_BRANCH from $ORIGIN."
git push --tags "$ORIGIN" || \ git push --tags "$ORIGIN" || \
die "Could not push tags to $ORIGIN." die "Could not push tags to $ORIGIN."
fi fi
echo echo
echo "Summary of actions:" echo "Summary of actions:"
...@@ -237,8 +237,8 @@ cmd_finish() { ...@@ -237,8 +237,8 @@ cmd_finish() {
echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'" echo "- The hotfix was tagged '$VERSION_PREFIX$VERSION'"
echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'" echo "- Hotfix branch has been back-merged into '$DEVELOP_BRANCH'"
echo "- Hotfix branch '$BRANCH' has been deleted" echo "- Hotfix branch '$BRANCH' has been deleted"
if flag push; then if flag push; then
echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'" echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'"
fi fi
echo echo
} }
...@@ -165,7 +165,7 @@ cmd_finish() { ...@@ -165,7 +165,7 @@ cmd_finish() {
DEFINE_boolean sign false "sign the release tag cryptographically" s DEFINE_boolean sign false "sign the release tag cryptographically" s
DEFINE_string signingkey "" "use the given GPG-key for the digital signature (implies -s)" u 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_string message "" "use the given tag message" m
DEFINE_boolean push false "push to $ORIGIN after performing finish" p DEFINE_boolean push false "push to $ORIGIN after performing finish" p
parse_args "$@" parse_args "$@"
require_version_arg require_version_arg
...@@ -228,14 +228,14 @@ cmd_finish() { ...@@ -228,14 +228,14 @@ cmd_finish() {
# delete branch # delete branch
git branch -d "$BRANCH" git branch -d "$BRANCH"
if flag push; then if flag push; then
git push "$ORIGIN" "$DEVELOP_BRANCH" || \ git push "$ORIGIN" "$DEVELOP_BRANCH" || \
die "Could not push to $DEVELOP_BRANCH from $ORIGIN." die "Could not push to $DEVELOP_BRANCH from $ORIGIN."
git push "$ORIGIN" "$MASTER_BRANCH" || \ git push "$ORIGIN" "$MASTER_BRANCH" || \
die "Could not push to $MASTER_BRANCH from $ORIGIN." die "Could not push to $MASTER_BRANCH from $ORIGIN."
git push --tags "$ORIGIN" || \ git push --tags "$ORIGIN" || \
die "Could not push tags to $ORIGIN." die "Could not push tags to $ORIGIN."
fi fi
echo echo
echo "Summary of actions:" echo "Summary of actions:"
...@@ -244,8 +244,8 @@ cmd_finish() { ...@@ -244,8 +244,8 @@ cmd_finish() {
echo "- The release was tagged '$tagname'" echo "- The release was tagged '$tagname'"
echo "- Release branch has been back-merged into '$DEVELOP_BRANCH'" echo "- Release branch has been back-merged into '$DEVELOP_BRANCH'"
echo "- Release branch '$BRANCH' has been deleted" echo "- Release branch '$BRANCH' has been deleted"
if flag push; then if flag push; then
echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'" echo "- '$DEVELOP_BRANCH', '$MASTER_BRANCH' and tags have been pushed to '$ORIGIN'"
fi fi
echo echo
} }
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