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

Prevent error message on git flow init.
xvm03 · Jul 10, 2012 · 53e9c76 · 53e9c76
2 parents aa93d23 + b72a395
commit 53e9c76
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 "$@"