Merge branch 'main' into feat_add_update_command

src/cmd/cmd_test.go

@@ -157,4 +157,35 @@ func Test_CommitCmdWithM(t *testing.T) {
 
 }
 
+// output doesnt match the expected terminal behavior very confusing...
+// func Test_CommitWithGitFlags(t *testing.T) {
+// 	skipCI(t)
+// 	setup()
+// 	defer teardown()
+//
+// 	//stdout reader
+// 	outC, r, w, old := StdoutReader()
+//
+// 	go func() {
+// 		var buf bytes.Buffer
+// 		io.Copy(&buf, r)
+// 		outC <- buf.String()
+// 	}()
+//
+// 	cmd := rootCmd
+// 	cmd.SetArgs([]string{"-g", "\"-a --dry-run\"", "Test commit message"})
+// 	cmd.Execute()
+//
+// 	w.Close()
+// 	os.Stdout = old
+// 	outStr := <-outC
+// 	if outStr == "" {
+// 		t.Errorf("Expected output but got nothing")
+// 	}
+//
+// 	if !strings.Contains(outStr, "Changes to be commited:\n") {
+// 		t.Errorf("Expected to find 'Test commit message' in output but got %s", outStr)
+// 	}
+// }
+
 // root CMD TEST END

src/cmd/cz.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/Slug-Boi/cocommit/src/cmd/tui"
 	"github.com/Slug-Boi/cocommit/src/cmd/utils"
@@ -24,6 +25,7 @@ This will require the user to have commitizen installed on their system.`,
 		// check if the print flag is set
 		pflag, _ := cmd.Flags().GetBool("print")
 		cflag, _ := cmd.Flags().GetBool("cli")
+		gflag, _ := cmd.Flags().GetString("git")
 
 		// run execute commands again as root run will not call this part
 		message = utils.Cz_Call()
@@ -41,12 +43,16 @@ This will require the user to have commitizen installed on their system.`,
 		// call tui
 		authors = tui.Entry()
 
-		skip_tui:
+	skip_tui:
 		// build the commit message
 		message = utils.Commit(message, authors)
 
 		// commit the message
-		utils.GitWrapper(message)
+		var git_flags []string
+		if gflag != "" {
+			git_flags = strings.Split(gflag, " ")
+		}
+		utils.GitWrapper(message, git_flags)
 
 		if pflag {
 			fmt.Println(message)
@@ -56,6 +62,7 @@ This will require the user to have commitizen installed on their system.`,
 
 func init() {
 	rootCmd.AddCommand(czCmd)
+	czCmd.Flags().StringP("git", "g", "", "Passes the flags specified to the git command")
 	czCmd.Flags().BoolP("print", "p", false, "Print the commit message")
 	czCmd.Flags().BoolP("cli", "c", false, "[co-author1] [co-author2] ...")
 }

src/cmd/root.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/Slug-Boi/cocommit/src/cmd/tui"
 	"github.com/Slug-Boi/cocommit/src/cmd/utils"
@@ -37,10 +38,17 @@ var rootCmd = &cobra.Command{
 		tflag, _ := cmd.Flags().GetBool("test_print")
 		aflag, _ := cmd.Flags().GetBool("authors")
 		vflag, _ := cmd.Flags().GetBool("version")
+    gflag, _ := cmd.Flags().GetString("git")
     
 		if vflag {
 			fmt.Println("Cocommit version:", Coco_Version)
 			os.Exit(0)
+    }
+      
+		var git_flags []string
+		// runs the git commit command
+		if gflag != "" {
+			git_flags = strings.Split(gflag, " ")
 		}
 
 		if aflag {
@@ -70,7 +78,7 @@ var rootCmd = &cobra.Command{
 					return
 				}
 
-				utils.GitWrapper(args[0])
+				utils.GitWrapper(args[0], git_flags)
 				if pflag {
 					fmt.Println(args[0])
 				}
@@ -88,12 +96,17 @@ var rootCmd = &cobra.Command{
 		message = utils.Commit(args[0], args[1:])
 
 	tui:
+		if tflag {
+			fmt.Println(message)
+			return
+		}
+
 		// prints the commit message to the console if the print flag is set
 		if pflag {
 			fmt.Println(message)
 		}
-		// runs the git commit command
-		utils.GitWrapper(message)
+
+		utils.GitWrapper(message, git_flags)
 	},
 }
 
@@ -118,4 +131,5 @@ func init() {
 	rootCmd.Flags().BoolP("message", "m", false, "Does nothing but allows for -m to be used in the command")
 	rootCmd.Flags().BoolP("authors", "a", false, "Runs the author list TUI")
 	rootCmd.Flags().BoolP("version", "v", false, "Prints the version of the cocommit cli tool")
+	rootCmd.Flags().StringP("git", "g", "", "Adds the given flags to the git command")
 }

src/cmd/utils/commit.go

@@ -61,9 +61,15 @@ skip_loop:
 	return sb.String()
 }
 
-func GitWrapper(commit string) {
+func GitWrapper(commit string, flags []string) {
 	// commit shell command
-	cmd := exec.Command("git", "commit", "-m", commit)
+	// specify git command
+	input := []string{"commit"}
+	// append the message to the flags
+	flags = append(flags, "-m", commit)
+	// concat the git command and the flags + message
+	input = append(input, flags...)
+	cmd := exec.Command("git", input...)
 
 	// https://stackoverflow.com/questions/18159704/how-to-debug-exit-status-1-error-when-running-exec-command-in-golang