Permalink
Browse files

Cleanup (mostly whitespace issues).

  • Loading branch information...
1 parent 75fbdd7 commit 0c4d0bf0f01b252967fb8f79d946642901d80b92 @nvie committed Jul 9, 2012
Showing with 28 additions and 28 deletions.
  1. +8 −8 git-flow-feature
  2. +20 −20 git-flow-release
View
@@ -232,7 +232,7 @@ cmd_finish() {
DEFINE_boolean rebase false "rebase instead of merge" r
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean force_delete false "force delete feature branch after finish" D
- DEFINE_boolean squash false "squash feature during merge" S
+ DEFINE_boolean squash false "squash feature during merge" S
parse_args "$@"
expand_nameprefix_arg_or_current
@@ -313,13 +313,13 @@ cmd_finish() {
if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then
git merge --ff "$BRANCH"
else
- if noflag squash; then
+ if noflag squash; then
git merge --no-ff "$BRANCH"
- else
- git merge --squash "$BRANCH"
- git commit
- git merge "$BRANCH"
- fi
+ else
+ git merge --squash "$BRANCH"
+ git commit
+ git merge "$BRANCH"
+ fi
fi
if [ $? -ne 0 ]; then
@@ -360,7 +360,7 @@ helper_finish_cleanup() {
git branch -d "$BRANCH"
fi
fi
-t
+
echo
echo "Summary of actions:"
echo "- The feature branch '$BRANCH' was merged into '$DEVELOP_BRANCH'"
View
@@ -193,7 +193,7 @@ cmd_finish() {
DEFINE_boolean push false "push to $ORIGIN after performing finish" p
DEFINE_boolean keep false "keep branch after performing finish" k
DEFINE_boolean notag false "don't tag this release" n
- DEFINE_boolean squash false "squash release during merge" S
+ DEFINE_boolean squash false "squash release during merge" S
parse_args "$@"
require_version_arg
@@ -225,15 +225,15 @@ cmd_finish() {
if ! git_is_branch_merged_into "$BRANCH" "$MASTER_BRANCH"; then
git checkout "$MASTER_BRANCH" || \
die "Could not check out $MASTER_BRANCH."
- if noflag squash; then
- git merge --no-ff "$BRANCH" || \
- die "There were merge conflicts."
- # TODO: What do we do now?
- else
- git merge --squash "$BRANCH" || \
- die "There were merge conflicts."
- git commit
- fi
+ if noflag squash; then
+ git merge --no-ff "$BRANCH" || \
+ die "There were merge conflicts."
+ # TODO: What do we do now?
+ else
+ git merge --squash "$BRANCH" || \
+ die "There were merge conflicts."
+ git commit
+ fi
fi
if noflag notag; then
@@ -260,16 +260,16 @@ cmd_finish() {
# TODO: Actually, accounting for 'git describe' pays, so we should
# ideally git merge --no-ff $tagname here, instead!
- if noflag squash; then
- git merge --no-ff "$BRANCH" || \
- die "There were merge conflicts."
- # TODO: What do we do now?
- else
- git merge --squash "$BRANCH" || \
- die "There were merge conflicts."
- # TODO: What do we do now?
- git commit
- fi
+ if noflag squash; then
+ git merge --no-ff "$BRANCH" || \
+ die "There were merge conflicts."
+ # TODO: What do we do now?
+ else
+ git merge --squash "$BRANCH" || \
+ die "There were merge conflicts."
+ # TODO: What do we do now?
+ git commit
+ fi
fi
# delete branch

0 comments on commit 0c4d0bf

Please sign in to comment.