Merge pull request #235 from oddnoc/feature/112-init-fix

Prevent error message on git flow init.

Merge pull request #235 from oddnoc/feature/112-init-fix
Prevent error message on git flow init.
53e9c768 · Vincent Driessen · aa93d234 · b72a395b · 53e9c768
Commit 53e9c768 authored Jul 10, 2012 by Vincent Driessen
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

git-flow git-flow +1 -1

No files found.
--- a/git-flow
+++ b/git-flow
@@ -109,7 +109,7 @@ main() {
 	fi

 	# run the specified action
-  if [ $SUBACTION != "help" ]; then
+  if [ $SUBACTION != "help" ] && [ $SUBCOMMAND != "init" ] ; then
    init
  fi
  cmd_$SUBACTION "$@"