close #89 return wrap up to default behavior

Author: groenborg

cmd/wrapup.go

@@ -4,18 +4,16 @@ import (
 	"fmt"
 
 	"github.com/praqma/git-phlow/cmd/cmdperm"
-	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/phlow"
 	"github.com/praqma/git-phlow/ui"
 	"github.com/spf13/cobra"
 )
 
 var wrapupCmd = &cobra.Command{
 	Use:   "wrapup",
-	Short: "add changes and make auto-commit",
+	Short: "Add changes to index and auto commit",
 	Long: fmt.Sprintf(`
-%s commits the currently staged files with a 'close issue' commit message, e.g. "close #42 fetch meaning of life".
-The commit message will cause the corresponding issue to be closed when the commit is integrated.
+%s commits the currently staged files with a 'close issue' commit message, e.g. "close #42 fetch meaning of life". The commit message will cause the corresponding issue to be closed when the commit is integrated.
 `, ui.Format.Bold("wrapup")),
 	PreRun: func(cmd *cobra.Command, args []string) {
 		cmdperm.RequiredCurDirRepository()
@@ -27,6 +25,4 @@ The commit message will cause the corresponding issue to be closed when the comm
 
 func init() {
 	RootCmd.AddCommand(wrapupCmd)
-
-	wrapupCmd.Flags().BoolVar(&options.GlobalFlagHard, "hard", false, "Add all changes before committing")
 }

options/option.go

@@ -29,9 +29,6 @@ var (
 	//GlobalFlagPrefixForReady ...
 	GlobalFlagPrefixForReady string
 
-	//GlobalFlagHard ...
-	GlobalFlagHard bool
-
 	//Sha1 git commit hash
 	Sha1 string
 

phlow/wrapup.go

@@ -7,19 +7,15 @@ import (
 	"os"
 
 	"github.com/praqma/git-phlow/githandler"
-	"github.com/praqma/git-phlow/options"
 )
 
 //WrapUp ...
 func WrapUp() {
 
 	//Add all files to index
-	if options.GlobalFlagHard {
-		fmt.Fprintln(os.Stdout, "Adding files to index")
-		if err := githandler.Add(); err != nil {
-			fmt.Println("Project files could not be added: " + err.Error())
-			return
-		}
+	if err := githandler.Add(); err != nil {
+		fmt.Println("Project files could not be added: " + err.Error())
+		return
 	}
 
 	//Retrieve branch info - current branch