create gitutil (#37)

Author: slack-jallen

CLAUDE.md

@@ -58,13 +58,20 @@ Commands follow this structure:
 - Helper functions: `getTargetCommits()`
 - Shell completions are provided by cobra's built-in `completion` command
 
-**util/** - Shared utilities
+**util/** - Core infrastructure
 - `AppConfig`: Dependency injection struct for testing (holds IO, Exit function, paths)
 - `execute.go`: Command execution with `ExecuteOrDie()` and `ExecuteOptions`
-- `git_util.go`: Git operations (branch detection, stashing, etc.)
-- `gh_util.go`: GitHub CLI interactions
+- `git_util.go`: Low-level git helpers (`GetCurrentBranchName`, `GetRepoName`) needed by infrastructure
 - `TestExecutor`: Mock executor for unit tests (allows faking git/gh responses)
 
+**gitutil/** - Git and GitHub operations
+- `git_util.go`: Branch detection (local/remote main, worktrees), stashing, cherry-pick, rebase
+- `gh_util.go`: GitHub CLI interactions (PR status, checks, reviews)
+- `gh_pr_info.go`: PR info queries (merged/unmerged PR lookup)
+- `gh_repo.go`: Repository metadata (name with owner, hostname)
+- `gh_checks.go`: CI check status with historical min-checks caching
+- `git_rollback.go`: Rollback manager for safe git operations
+
 **templates/** - PR template system and git log parsing
 - `GitLog` struct: Represents a commit with its branch and metadata
 - `GetNewCommits()`: Parses commits between local main and origin/main
@@ -113,7 +120,7 @@ To add a new command:
 
 ## Important Conventions
 
-- **Main branch**: Tool supports either `main` or `master` via `util.GetMainBranchOrDie()`
+- **Main branch**: Tool supports either `main` or `master` via `gitutil.GetLocalMainBranchOrDie()` (respects worktrees) and `gitutil.GetRemoteMainBranchOrDie()`
 - **Branch naming**: Auto-generated from commit subject (sanitized, max 120 chars)
 - **Error handling**: Use `panic()` for user-facing errors (caught by defer/recover in `ExecuteCommand` and `testParseArgumentsWithOut`). This is an intentional design choice, not a code smell. The panic/recover pattern keeps command implementations clean — commands just `panic("message")` on errors and the top-level recover catches them, prints the message, and exits gracefully. Do NOT refactor this to use returned errors; that would add boilerplate to every command for no benefit
 - **Logging**: Use `slog` (Debug, Info, Warn, Error levels). Always pass a single `fmt.Sprint(...)` message string — do NOT use slog's key-value args (e.g. `slog.Debug(fmt.Sprint("msg: ", val))` not `slog.Debug("msg", "key", val)`), as the key-value format produces undesirable output with the project's custom logger

commands/command_add_description.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 
 	"github.com/slackhq/gh-stacked-diff/v2/ai"
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/interactive"
 	"github.com/slackhq/gh-stacked-diff/v2/templates"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
@@ -52,7 +53,7 @@ func executeAddDescription(targetCommits []templates.GitLog) {
 func addDescriptionForBranch(branch string) {
 	appConfig := util.GetAppConfig()
 	slog.Info("Getting PR info for branch " + branch)
-	pr := util.GetUnmergedPR(branch)
+	pr := gitutil.GetUnmergedPR(branch)
 	if pr == nil {
 		panic("No open PR found for branch " + branch)
 	}
@@ -63,7 +64,7 @@ func addDescriptionForBranch(branch string) {
 	util.ExecuteOrDie(util.ExecuteOptions{Io: appConfig.Io}, "gh", "pr", "edit", pr.Number, "--body", newBody)
 }
 
-func createAiDescription(pr util.PrInfo) string {
+func createAiDescription(pr gitutil.PrInfo) string {
 	appConfig := util.GetAppConfig()
 	prompt := ai.GetPromptPrDescription(pr.Number)
 	outWriter := util.NewWriteRecorder(appConfig.Io.Out)
@@ -104,7 +105,7 @@ func parseDescription(aiOutput string) string {
 	return string(aiOutput[start+len(begins[beginIndex]) : start+end])
 }
 
-func getNewPrBody(pr util.PrInfo, description string) string {
+func getNewPrBody(pr gitutil.PrInfo, description string) string {
 	bodyComment := GENERATED_CLAUDE_SUMMARY_BEGIN + description + GENERATED_CLAUDE_SUMMARY_END
 
 	bodyWithoutComment := pr.Body

commands/command_add_description_test.go

@@ -8,6 +8,7 @@ import (
 
 	tea "github.com/charmbracelet/bubbletea"
 
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/interactive"
 	"github.com/slackhq/gh-stacked-diff/v2/testutil"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
@@ -25,7 +26,7 @@ func TestSdAddDescription_WhenHasPr_UpdatesPrBody(t *testing.T) {
 
 	testParseArguments("new", "1")
 
-	testExecutor.SetResponse("101"+util.GhDelim+"first"+util.GhDelim+"open"+util.GhDelim+prBodyBegin+prBodyEnd, nil, "gh", "pr", "list", util.MatchAnyRemainingArgs)
+	testExecutor.SetResponse("101"+gitutil.GhDelim+"first"+gitutil.GhDelim+"open"+gitutil.GhDelim+prBodyBegin+prBodyEnd, nil, "gh", "pr", "list", util.MatchAnyRemainingArgs)
 
 	generatedDescription := "Ai\ngenerated\ndescription\n"
 	aiOut := "Based on the PR changes, here's my recommended description:\n```markdown\n" + generatedDescription + "\n```\n"
@@ -68,7 +69,7 @@ func TestSdAddDescription_WhenHasPrHasExistingComment_ReplacesComment(t *testing
 	originalBody := prBodyBegin + addition + prBodyEnd
 	testParseArguments("new", "1")
 
-	testExecutor.SetResponse("101"+util.GhDelim+"first"+util.GhDelim+"open"+util.GhDelim+originalBody, nil, "gh", "pr", "list", util.MatchAnyRemainingArgs)
+	testExecutor.SetResponse("101"+gitutil.GhDelim+"first"+gitutil.GhDelim+"open"+gitutil.GhDelim+originalBody, nil, "gh", "pr", "list", util.MatchAnyRemainingArgs)
 
 	updatedDescription := "this is an\nupdated description\n"
 	aiOut := "Based on the PR changes, here's my recommended description:\n```markdown\n" + updatedDescription + "\n```\n"

commands/command_add_reviewers.go

@@ -8,6 +8,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/interactive"
 	"github.com/slackhq/gh-stacked-diff/v2/templates"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
@@ -101,7 +102,7 @@ func checkBranch(targetCommit templates.GitLog, opts AddReviewersOptions, progre
 		addReviewers(targetCommit, opts.Reviewers, progressIndicator, index)
 	}
 	if opts.AutoMerge {
-		util.ExecuteOrDie(util.ExecuteOptions{Retries: util.GhRetries}, "gh", "pr", "merge", targetCommit.Branch, "--auto", "--squash")
+		util.ExecuteOrDie(util.ExecuteOptions{Retries: gitutil.GhRetries}, "gh", "pr", "merge", targetCommit.Branch, "--auto", "--squash")
 		progressIndicator.SetLogLine(index, "Auto-merge enabled")
 	}
 }
@@ -123,7 +124,7 @@ func waitForChecks(targetCommit templates.GitLog, opts AddReviewersOptions, prog
 		countdown(progressIndicator, index, int(opts.WaitBeforePolling.Seconds()), "for Github to add checks to pushed changes")
 	}
 	for {
-		summary := util.GetChecksStatus(targetCommit.Branch, opts.MinChecks)
+		summary := gitutil.GetChecksStatus(targetCommit.Branch, opts.MinChecks)
 		progressIndicator.SetProgress(index, float64(summary.PercentageComplete()))
 		if summary.IsFailing() {
 			if !opts.Silent {
@@ -150,7 +151,7 @@ func waitForChecks(targetCommit templates.GitLog, opts AddReviewersOptions, prog
 
 func markPrReady(targetCommit templates.GitLog, progressIndicator *interactive.ProgressIndicator, index int) {
 	progressIndicator.SetLogLine(index, "Marking PR as ready for review")
-	util.ExecuteOrDie(util.ExecuteOptions{Retries: util.GhRetries}, "gh", "pr", "ready", targetCommit.Branch)
+	util.ExecuteOrDie(util.ExecuteOptions{Retries: gitutil.GhRetries}, "gh", "pr", "ready", targetCommit.Branch)
 	progressIndicator.SetLogLine(index, "PR marked as ready for review")
 }
 
@@ -177,7 +178,7 @@ func addReviewers(targetCommit templates.GitLog, reviewers string, progressIndic
 }
 
 func getNonApprovingUsers(commit templates.GitLog, reviewers string) (string, string) {
-	allApprovingUsers := util.GetAllApprovingUsers(commit.Branch)
+	allApprovingUsers := gitutil.GetAllApprovingUsers(commit.Branch)
 	approvingUsers := make([]string, 0)
 	nonApprovingUsers := make([]string, 0)
 	for _, reviewer := range strings.Split(reviewers, ",") {

commands/command_add_reviewers_test.go

@@ -13,6 +13,7 @@ import (
 
 	"errors"
 
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/interactive"
 	"github.com/slackhq/gh-stacked-diff/v2/templates"
 	"github.com/slackhq/gh-stacked-diff/v2/testutil"
@@ -31,10 +32,10 @@ func TestSdAddReviewers_AddReviewers(t *testing.T) {
 	allCommits := templates.GetAllCommits()
 	testExecutor.SetResponse(
 		// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks),
+		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks),
 		nil, "gh", "pr", "view", util.MatchAnyRemainingArgs)
 
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--reviewers=mybestie", allCommits[0].Commit)
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--reviewers=mybestie", allCommits[0].Commit)
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "mybestie"}
@@ -57,10 +58,10 @@ func TestSdAddReviewers_WhenUsingListIndicator_AddReviewers(t *testing.T) {
 	allCommits := templates.GetAllCommits()
 	testExecutor.SetResponse(
 		// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks),
+		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks),
 		nil, "gh", "pr", "view", util.MatchAnyRemainingArgs)
 
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--indicator=list", "--reviewers=mybestie", "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--indicator=list", "--reviewers=mybestie", "1")
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "mybestie"}
@@ -83,11 +84,11 @@ func TestSdAddReviewers_WhenOmittingCommitIndicator_AsksForSelection(t *testing.
 	allCommits := templates.GetAllCommits()
 	testExecutor.SetResponse(
 		// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks),
+		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks),
 		nil, "gh", "pr", "view", util.MatchAnyRemainingArgs)
 
 	interactive.SendToProgram(0, interactive.NewMessageKey(tea.KeyEnter))
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--indicator=list", "--reviewers=mybestie")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--indicator=list", "--reviewers=mybestie")
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "mybestie"}
@@ -109,7 +110,7 @@ func TestSdAddReviewers_WhenUserAlreadyApproved_DoesNotRequestReview(t *testing.
 
 	allCommits := templates.GetAllCommits()
 	// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks)
+	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks)
 	testExecutor.SetResponseFunc(checksSuccess, nil, func(programName string, args ...string) bool {
 		return programName == "gh" &&
 			args[0] == "pr" &&
@@ -125,7 +126,7 @@ func TestSdAddReviewers_WhenUserAlreadyApproved_DoesNotRequestReview(t *testing.
 			slices.Contains(args, "reviews")
 	})
 
-	out := testParseArguments("--log-level=info", "add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--reviewers=alreadyapproved2,mybestie,alreadyapproved1", "1")
+	out := testParseArguments("--log-level=info", "add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--reviewers=alreadyapproved2,mybestie,alreadyapproved1", "1")
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "mybestie"}
@@ -149,15 +150,15 @@ func TestSdAddReviewers_UserChoosesHistory_ChoosesSameReviewers(t *testing.T) {
 
 	allCommits := templates.GetAllCommits()
 	// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks)
+	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks)
 	testExecutor.SetResponseFunc(checksSuccess, nil, func(programName string, args ...string) bool {
 		return programName == "gh" &&
 			args[0] == "pr" &&
 			args[1] == "view" &&
 			slices.Contains(args, "statusCheckRollup")
 	})
 
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--reviewers=mybestie", "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--reviewers=mybestie", "1")
 
 	// Clear responses.
 	testExecutor.Responses = []util.ExecutedResponse{}
@@ -167,7 +168,7 @@ func TestSdAddReviewers_UserChoosesHistory_ChoosesSameReviewers(t *testing.T) {
 		interactive.NewMessageKey(tea.KeyUp),
 		interactive.NewMessageKey(tea.KeyEnter),
 	)
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "1")
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "mybestie"}
@@ -189,7 +190,7 @@ func TestSdAddReviewers_UserChoosesHistoryFromTyped_ChoosesSameReviewers(t *test
 
 	allCommits := templates.GetAllCommits()
 	// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks)
+	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks)
 	testExecutor.SetResponseFunc(checksSuccess, nil, func(programName string, args ...string) bool {
 		return programName == "gh" &&
 			args[0] == "pr" &&
@@ -203,7 +204,7 @@ func TestSdAddReviewers_UserChoosesHistoryFromTyped_ChoosesSameReviewers(t *test
 		interactive.NewMessageRune('y'),
 		interactive.NewMessageKey(tea.KeyEnter),
 	)
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "1")
 
 	// Clear responses.
 	testExecutor.Responses = []util.ExecutedResponse{}
@@ -213,7 +214,7 @@ func TestSdAddReviewers_UserChoosesHistoryFromTyped_ChoosesSameReviewers(t *test
 		interactive.NewMessageKey(tea.KeyUp),
 		interactive.NewMessageKey(tea.KeyEnter),
 	)
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "1")
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "edit", allCommits[0].Branch, "--add-reviewer", "my"}
@@ -232,12 +233,12 @@ func TestSdAddReviewers_WhenNoReviewersSelected_DoesNotAddReviewers(t *testing.T
 	testParseArguments("new", "1")
 
 	testExecutor.SetResponse(
-		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks),
+		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks),
 		nil, "gh", "pr", "view", util.MatchAnyRemainingArgs)
 
 	// Select PR, then enter empty reviewers.
 	interactive.SendToProgram(0, interactive.NewMessageKey(tea.KeyEnter))
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "1")
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "1")
 
 	assertGhSubcommandCalled(t, testExecutor.Responses, false, "pr", "edit")
 	assertGhSubcommandCalled(t, testExecutor.Responses, true, "pr", "ready")
@@ -255,10 +256,10 @@ func TestSdAddReviewers_WhenMergeFlag_EnablesAutoMerge(t *testing.T) {
 	allCommits := templates.GetAllCommits()
 	testExecutor.SetResponse(
 		// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks),
+		strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks),
 		nil, "gh", "pr", "view", util.MatchAnyRemainingArgs)
 
-	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(util.DefaultMinChecks), "--merge", "--reviewers=mybestie", allCommits[0].Commit)
+	testParseArguments("add-reviewers", "--min-checks", fmt.Sprint(gitutil.DefaultMinChecks), "--merge", "--reviewers=mybestie", allCommits[0].Commit)
 
 	contains := slices.ContainsFunc(testExecutor.Responses, func(next util.ExecutedResponse) bool {
 		ghExpectedArgs := []string{"pr", "merge", allCommits[0].Branch, "--auto", "--squash"}
@@ -280,7 +281,7 @@ func TestSdAddReviewers_WhenMinChecksFails_UsesDefault(t *testing.T) {
 
 	allCommits := templates.GetAllCommits()
 	// Each check has 3 values: status, conclusion, and state. Copied DefaultMinChecks times.
-	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", util.DefaultMinChecks)
+	checksSuccess := strings.Repeat("SUCCESS\nSUCCESS\nSUCCESS\n", gitutil.DefaultMinChecks)
 	testExecutor.SetResponseFunc(checksSuccess, nil, func(programName string, args ...string) bool {
 		return programName == "gh" &&
 			args[0] == "pr" &&

commands/command_checkout.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/interactive"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
 	"github.com/spf13/cobra"
@@ -12,11 +13,11 @@ func createCheckoutCommand() *cobra.Command {
 		Short: "Checks out branch associated with commit indicator",
 		Long: "Checks out the branch associated with commit indicator.\n" +
 			"\n" +
-			"For when you want to merge only the branch with with origin/" + util.GetMainBranchForHelp() + ",\n" +
-			"rather than your entire local " + util.GetMainBranchForHelp() + " branch, verify why \n" +
+			"For when you want to merge only the branch with with origin/" + gitutil.GetMainBranchForHelp() + ",\n" +
+			"rather than your entire local " + gitutil.GetMainBranchForHelp() + " branch, verify why \n" +
 			"CI is failing on that particular branch, or for any other reason.\n" +
 			"\n" +
-			"After modifying the branch you can use \"sd replace-commit\" to sync local " + util.GetMainBranchForHelp() + ".",
+			"After modifying the branch you can use \"sd replace-commit\" to sync local " + gitutil.GetMainBranchForHelp() + ".",
 		Args: cobra.MaximumNArgs(1),
 	}
 	indicatorTypeString := addIndicatorFlag(cmd)

commands/command_code_owners.go

@@ -7,6 +7,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
 	"github.com/spf13/cobra"
 
@@ -84,7 +85,7 @@ func changedFilesOwners(changedFiles []string) map[string][]string {
 Returns changed files against main.
 */
 func getChangedFiles() []string {
-	firstOriginCommit := util.FirstOriginMainCommit(util.GetCurrentBranchName())
+	firstOriginCommit := gitutil.FirstOriginMainCommit(util.GetCurrentBranchName())
 	filenamesRaw := util.ExecuteOrDie(util.ExecuteOptions{}, "git", "--no-pager",
 		"log", "--pretty=format:\"\"", "--name-only", firstOriginCommit+"..HEAD")
 	return strings.Split(strings.TrimSpace(filenamesRaw), "\n")

commands/command_code_owners_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/slackhq/gh-stacked-diff/v2/gitutil"
 	"github.com/slackhq/gh-stacked-diff/v2/testutil"
 	"github.com/slackhq/gh-stacked-diff/v2/util"
 )
@@ -17,7 +18,7 @@ func TestSdCodeOwners_OutputsOwnersOfChangedFiles(t *testing.T) {
 
 	testutil.AddCommit("first", "first-not-changed")
 
-	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "push", "origin", util.GetLocalMainBranchOrDie())
+	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "push", "origin", gitutil.GetLocalMainBranchOrDie())
 
 	testutil.AddCommit("second", "second-changed")