Cleanup (mostly whitespace issues).

xvm03 · Jul 9, 2012 · 0c4d0bf · 0c4d0bf
1 parent 75fbdd7
commit 0c4d0bf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/git-flow-feature b/git-flow-feature
@@ -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'"

diff --git a/git-flow-release b/git-flow-release
@@ -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