organise git commands

Author: mrados7

.git-tools-2.json

@@ -6,6 +6,7 @@ import (
 	"github.com/charmbracelet/bubbles/textinput"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/mrados7/go-git-commands/cmd/git"
 	"os"
 )
 
@@ -120,7 +121,7 @@ func (m model) UpdateBranchNameInput(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case tea.KeyCtrlC, tea.KeyEsc:
 			return m, tea.Quit
 		case tea.KeyEnter:
-			err := checkoutNewBranch(getBranchName(m))
+			err := git.CheckoutNewBranch(getBranchName(m))
 			if err != nil {
 				fmt.Println(err)
 				os.Exit(1)
@@ -235,7 +236,7 @@ func getBranchName(m model) string {
 }
 
 func main() {
-	isGitRepo := checkIfGitRepo()
+	isGitRepo := git.CheckIfGitRepo()
 	if !isGitRepo {
 		fail("Error: not a git repository")
 	}

cmd/checkout/git.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"github.com/charmbracelet/lipgloss"
+	"github.com/mrados7/go-git-commands/cmd/git"
 	"log"
 	"os"
 	"os/exec"
@@ -35,19 +36,23 @@ type model struct {
 }
 
 func main() {
+	isGitRepo := git.CheckIfGitRepo()
+	if !isGitRepo {
+		log.Fatal("Not a git repository")
+	}
 	p := tea.NewProgram(initialModel())
 	if _, err := p.Run(); err != nil {
 		log.Fatal(err)
 	}
 }
 
 func initialModel() model {
-	branch, err := getCurrentGitBranch()
+	branch, err := git.GetCurrentGitBranch()
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	stagedFiles := getStagedFiles()
+	stagedFiles := git.GetStagedFiles()
 
 	if len(stagedFiles) == 0 {
 		log.Fatal("No staged files found")
@@ -107,16 +112,6 @@ func initialModel() model {
 	return m
 }
 
-func getCurrentGitBranch() (string, error) {
-	cmd := exec.Command("git", "branch", "--show-current")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return "", fmt.Errorf("error getting branch name: %v", err)
-	}
-
-	return strings.TrimSpace(string(output)), nil
-}
-
 func (m model) Init() tea.Cmd {
 	return textinput.Blink
 }
@@ -239,17 +234,3 @@ func (m model) View() string {
 
 	return b.String()
 }
-
-func getStagedFiles() []string {
-	cmd := exec.Command("git", "diff", "--name-only", "--cached")
-	out, err := cmd.Output()
-	if err != nil {
-		return []string{}
-	}
-
-	if len(out) == 0 {
-		return []string{}
-	}
-
-	return strings.Split(string(out), "\n")
-}

cmd/checkout/main.go

@@ -0,0 +1,49 @@
+package git
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+)
+
+func CheckoutNewBranch(branchName string) error {
+	cmd := exec.Command("git", "checkout", "-b", branchName)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd.Run()
+}
+
+func CheckIfGitRepo() bool {
+	cmd := exec.Command("git", "rev-parse", "--is-inside-work-tree")
+	cmd.Stderr = os.Stderr
+	err := cmd.Run()
+	if err != nil {
+		return false
+	}
+	return true
+}
+
+func GetStagedFiles() []string {
+	cmd := exec.Command("git", "diff", "--name-only", "--cached")
+	out, err := cmd.Output()
+	if err != nil {
+		return []string{}
+	}
+
+	if len(out) == 0 {
+		return []string{}
+	}
+
+	return strings.Split(string(out), "\n")
+}
+
+func GetCurrentGitBranch() (string, error) {
+	cmd := exec.Command("git", "branch", "--show-current")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return "", fmt.Errorf("error getting branch name: %v", err)
+	}
+
+	return strings.TrimSpace(string(output)), nil
+}