refactor(config): route all git calls through internal/git.Git

config.Config previously shelled out to git directly via exec.Command,
bypassing the safeexec.LookPath resolution that internal/git provides.
This adds ConfigGet/ConfigSet/ConfigUnset/ConfigSetWithComment/ConfigGetRegexp
methods to git.Git, rewires Config to accept a *git.Git dependency
(Load(path) becomes New(g)), and flips the construction order in all
cmd/ call sites so git.New runs first.

Author: cds-amal

cmd/adopt.go

@@ -36,13 +36,13 @@ func runAdopt(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	cfg, err := config.Load(cwd)
+	g := git.New(cwd)
+
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}
 
-	g := git.New(cwd)
-
 	// Parent is the required positional argument
 	parent := args[0]
 

cmd/adopt_test.go

@@ -12,8 +12,8 @@ import (
 func TestAdoptBranch(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -40,8 +40,8 @@ func TestAdoptBranch(t *testing.T) {
 func TestAdoptRejectsAlreadyTracked(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -60,8 +60,8 @@ func TestAdoptRejectsAlreadyTracked(t *testing.T) {
 func TestAdoptRejectsUntrackedParent(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -81,8 +81,8 @@ func TestAdoptRejectsUntrackedParent(t *testing.T) {
 func TestAdoptDetectsCycle(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -117,8 +117,8 @@ func TestAdoptDetectsCycle(t *testing.T) {
 func TestAdoptStoresForkPoint(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)

cmd/cascade.go

@@ -47,13 +47,13 @@ func runCascade(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	cfg, err := config.Load(cwd)
+	g := git.New(cwd)
+
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}
 
-	g := git.New(cwd)
-
 	// Check if cascade already in progress
 	if state.Exists(g.GetGitDir()) {
 		return errors.New("operation already in progress; use 'gh stack continue' or 'gh stack abort'")

cmd/continue.go

@@ -63,7 +63,7 @@ func runContinue(cmd *cobra.Command, args []string) error {
 
 	fmt.Printf("%s Completed %s\n", s.SuccessIcon(), s.Branch(st.Current))
 
-	cfg, err := config.Load(cwd)
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}

cmd/create.go

@@ -39,13 +39,13 @@ func runCreate(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	cfg, err := config.Load(cwd)
+	g := git.New(cwd)
+
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}
 
-	g := git.New(cwd)
-
 	// Get current branch
 	currentBranch, err := g.CurrentBranch()
 	if err != nil {

cmd/create_test.go

@@ -14,10 +14,9 @@ import (
 func TestCreateFromTrunk(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
-	cfg.SetTrunk("main")
-
 	g := git.New(dir)
+	cfg, _ := config.New(g)
+	cfg.SetTrunk("main")
 
 	// Simulate what create command does
 	currentBranch, _ := g.CurrentBranch()
@@ -57,8 +56,8 @@ func TestCreateFromTrunk(t *testing.T) {
 func TestCreateFromTrackedBranch(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	currentBranch, _ := g.CurrentBranch()
 	cfg.SetTrunk(currentBranch)
@@ -86,8 +85,8 @@ func TestCreateFromTrackedBranch(t *testing.T) {
 func TestCreateRejectsUntrackedBranch(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -119,8 +118,8 @@ func TestCreateRejectsUntrackedBranch(t *testing.T) {
 func TestCreateWithStagedChanges(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -151,8 +150,8 @@ func TestCreateWithStagedChanges(t *testing.T) {
 func TestCreateEmptyWithStagedChanges(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -197,8 +196,8 @@ func TestBranchAlreadyExists(t *testing.T) {
 func TestCreateStoresForkPoint(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)

cmd/init.go

@@ -32,13 +32,13 @@ func runInit(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	cfg, err := config.Load(cwd)
+	g := git.New(cwd)
+
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}
 
-	g := git.New(cwd)
-
 	// Determine trunk branch
 	trunk := trunkFlag
 	if trunk == "" {

cmd/init_test.go

@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/boneskull/gh-stack/internal/config"
+	"github.com/boneskull/gh-stack/internal/git"
 )
 
 func setupTestRepo(t *testing.T) string {
@@ -37,9 +38,10 @@ func TestInitCommand(t *testing.T) {
 	dir := setupTestRepo(t)
 
 	// Verify the config package works for init
-	cfg, err := config.Load(dir)
+	g := git.New(dir)
+	cfg, err := config.New(g)
 	if err != nil {
-		t.Fatalf("Load failed: %v", err)
+		t.Fatalf("New failed: %v", err)
 	}
 
 	err = cfg.SetTrunk("main")

cmd/link.go

@@ -35,12 +35,12 @@ func runLink(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	cfg, err := config.Load(cwd)
+	g := git.New(cwd)
+
+	cfg, err := config.New(g)
 	if err != nil {
 		return err
 	}
-
-	g := git.New(cwd)
 	branch, err := g.CurrentBranch()
 	if err != nil {
 		return err

cmd/link_test.go

@@ -11,8 +11,8 @@ import (
 func TestLinkPR(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -40,8 +40,8 @@ func TestLinkPR(t *testing.T) {
 func TestLinkRejectsUntrackedBranch(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)
@@ -59,8 +59,8 @@ func TestLinkRejectsUntrackedBranch(t *testing.T) {
 func TestLinkOverwritesPR(t *testing.T) {
 	dir := setupTestRepo(t)
 
-	cfg, _ := config.Load(dir)
 	g := git.New(dir)
+	cfg, _ := config.New(g)
 
 	trunk, _ := g.CurrentBranch()
 	cfg.SetTrunk(trunk)