Fix other minor inconsistencies round 3

Author: slack-jallen

commands/command_code_owners.go

@@ -86,7 +86,7 @@ func changedFilesOwners(changedFiles []string) map[string][]string {
 Returns changed files against main.
 */
 func getChangedFiles() []string {
-	firstOriginCommit := gitutil.FirstOriginMainCommit(util.GetCurrentBranchName())
+	firstOriginCommit := gitutil.GetMergeBaseWithOriginMain(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_migrate.go

@@ -134,6 +134,15 @@ func processBranch(branch string, baseCommit string) migrationResult {
 
 	// Re-check commits after rebase (hashes may have changed)
 	commitsAhead = getCommitsAhead(baseCommit, "HEAD")
+	if len(commitsAhead) == 0 {
+		slog.Info(fmt.Sprint("Branch ", branch, " has no commits after rebase - skipping"))
+		return migrationResult{
+			branchName: branch,
+			success:    false,
+			reason:     "no commits after rebase",
+			numCommits: 0,
+		}
+	}
 	slog.Debug(fmt.Sprint("Found ", len(commitsAhead), " commits ahead of main for branch ", branch))
 	for _, commit := range commitsAhead {
 		slog.Debug(fmt.Sprint("  - ", commit))
@@ -204,7 +213,7 @@ func findUserBranches() []string {
 		result[i] = b.name
 	}
 
-	slog.Info(fmt.Sprint("Found ", len(result), " branches with your commits"))
+	slog.Debug(fmt.Sprint("Found ", len(result), " branches with your commits"))
 	return result
 }
 
@@ -261,18 +270,18 @@ func selectBranchesToMigrate(branches []string) []string {
 	}
 
 	if len(disabledBranches) == len(branches) {
-		slog.Info("All branches already exist on main - nothing to migrate")
+		slog.Debug("All branches already exist on main - nothing to migrate")
 		util.Fprintln(appConfig.Io.Out, "All branches have already been migrated to main")
 		return []string{}
 	}
 
-	slog.Info("Starting interactive branch selection...")
+	slog.Debug("Starting interactive branch selection...")
 	selectedBranches, err := interactive.GetBranchSelectionWithFilter(
 		branches,
 		"Select branches to migrate (use space to select/deselect, enter to confirm):",
 		rowEnabled,
 	)
-	slog.Info("Interactive selection completed")
+	slog.Debug("Interactive selection completed")
 	if err != nil {
 		slog.Warn("Failed to get branch selection: " + err.Error())
 		return []string{}
@@ -284,10 +293,10 @@ func selectBranchesToMigrate(branches []string) []string {
 // computeDisabledBranches returns a set of branch indices that already have their
 // commits on main and should be disabled in the interactive selector.
 func computeDisabledBranches(branches []string) map[int]bool {
-	slog.Info("Fetching commits from main for branch filtering...")
+	slog.Debug("Fetching commits from main for branch filtering...")
 	mainBranch := gitutil.GetLocalMainBranchOrDie()
 	mainCommits := templates.GetNewCommits(mainBranch, "")
-	slog.Info(fmt.Sprint("Found ", len(mainCommits), " commits on main for branch filtering"))
+	slog.Debug(fmt.Sprint("Found ", len(mainCommits), " commits on main for branch filtering"))
 
 	branchesOnMain := make(map[string]bool)
 	for _, commit := range mainCommits {
@@ -296,12 +305,12 @@ func computeDisabledBranches(branches []string) map[int]bool {
 		}
 	}
 
-	slog.Info("Building branch filter...")
+	slog.Debug("Building branch filter...")
 	disabledBranches := make(map[int]bool)
 	for i, branch := range branches {
 		if branchesOnMain[branch] {
 			disabledBranches[i] = true
-			slog.Info(fmt.Sprint("Branch ", branch, " already exists on main - will be disabled"))
+			slog.Debug(fmt.Sprint("Branch ", branch, " already exists on main - will be disabled"))
 		}
 	}
 	return disabledBranches
@@ -319,7 +328,7 @@ func findMostRecentMainCommit(branches []string) string {
 
 	// For each branch, find its merge-base with origin/main
 	for _, branch := range allBranches {
-		mergeBase := gitutil.FirstOriginMainCommit(branch)
+		mergeBase := gitutil.GetMergeBaseWithOriginMain(branch)
 		slog.Debug(fmt.Sprint("Merge-base for ", branch, " with origin/main: ", mergeBase))
 
 		// Get the timestamp of this commit

commands/command_migrate_test.go

@@ -140,7 +140,7 @@ func TestSdMigrate_RebaseSingleBranch(t *testing.T) {
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "checkout", "feature-1")
 
 	// Get the most recent main commit
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	// Perform rebase
 	_, err := util.Execute(util.ExecuteOptions{}, "git", "rebase", mostRecentMainCommit)
@@ -177,7 +177,7 @@ func TestSdMigrate_RebaseMultipleBranches(t *testing.T) {
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "push", "origin", gitutil.GetLocalMainBranchOrDie())
 
 	// Get the most recent main commit
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	// Save current branch
 	currentBranch := util.ExecuteOrDieTrimmed(util.ExecuteOptions{}, "git", "branch", "--show-current")
@@ -220,7 +220,7 @@ func TestSdMigrate_RebaseFailure(t *testing.T) {
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "push", "origin", gitutil.GetLocalMainBranchOrDie())
 
 	// Get the most recent main commit
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	// Try to rebase - should fail due to conflict
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "checkout", "feature-1")
@@ -260,7 +260,7 @@ func TestSdMigrate_EndsOnMainBranch(t *testing.T) {
 	assert.Equal("feature-2", originalBranch)
 
 	// Get the most recent main commit
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	// Simulate the migrate process: checkout feature-1, rebase it
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "checkout", "feature-1")
@@ -483,7 +483,7 @@ func TestSdMigrate_SkipsBranchWithMergedPR(t *testing.T) {
 		"--json", "number,title,state", "--jq", util.MatchAnyRemainingArgs)
 
 	// Get the most recent main commit
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	// Record current branch before processing
 	currentBranch := util.ExecuteOrDieTrimmed(util.ExecuteOptions{}, "git", "branch", "--show-current")
@@ -529,7 +529,7 @@ func TestSdMigrate_SkipsDuplicateCommitsWhenMigratingBranchWithoutPR(t *testing.
 		"--json", "number,title,state", "--jq", util.MatchAnyRemainingArgs)
 
 	// Get the base commit for the feature branch
-	mostRecentMainCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+	mostRecentMainCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 
 	appConfig := util.GetAppConfig()
 	appConfig.Io.In = strings.NewReader("My Feature PR\n\n") // PR name, then empty string for prefix (press enter to skip)

commands/command_new.go

@@ -100,6 +100,7 @@ func createNewCommand() *cobra.Command {
 			*baseBranch = gitutil.GetLocalMainBranchOrDie()
 			remoteBaseBranch = gitutil.GetRemoteMainBranchOrDie()
 		} else {
+			util.RequireGitRef(*baseBranch)
 			remoteBaseBranch = *baseBranch
 		}
 		ticketUrlPattern := userConfig.TicketUrlPattern
@@ -139,7 +140,7 @@ func createNewPr(draft bool, noTemplate bool, featureFlag string, ticketUrlPatte
 func createBranchAndCherryPick(rollbackManager *gitutil.GitRollbackManager, baseBranch string, gitLog templates.GitLog) {
 	var commitToBranchFrom string
 	if baseBranch == gitutil.GetLocalMainBranchOrDie() {
-		commitToBranchFrom = gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+		commitToBranchFrom = gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 		slog.Info(fmt.Sprint("Switching to branch ", gitLog.Branch, " based off commit ", commitToBranchFrom))
 	} else {
 		commitToBranchFrom = baseBranch

commands/command_rebase_main.go

@@ -106,10 +106,13 @@ func rebaseMain() {
 		_, rebaseError = gitutil.RebaseAndSkipAllEmpty(options, "origin/"+gitutil.GetRemoteMainBranchOrDie())
 	}
 	if rebaseError != nil {
+		if shouldPopStash {
+			slog.Info("Your changes are still stashed. Run `git stash pop` after resolving the rebase.")
+		}
 		panic("Rebase failed, check output ^^ for details. Continue rebase manually.")
-	} else {
-		gitutil.PopStash(shouldPopStash)
 	}
+	// Only pop stash on success — popping onto merge conflicts would be a problem.
+	gitutil.PopStash(shouldPopStash)
 }
 
 // getMergedBranches returns branches from merged PRs that were merged AFTER our branch diverged.

commands/command_replace_commit.go

@@ -62,16 +62,11 @@ func replaceCommitOfBranchInfo(rollbackManager *gitutil.GitRollbackManager, onCh
 	rollbackCommit := util.ExecuteOrDieTrimmed(util.ExecuteOptions{}, "git", "log", "-n", "1", "--pretty=format:%H")
 	commitsAfter := strings.Fields(util.ExecuteOrDieTrimmed(util.ExecuteOptions{}, "git", "--no-pager", "log", gitLog.Commit+"..HEAD", "--pretty=format:%h"))
 	slices.Reverse(commitsAfter)
-	commitToDiffFrom := gitutil.FirstOriginMainCommit(gitLog.Branch)
+	commitToDiffFrom := gitutil.GetMergeBaseWithOriginMain(gitLog.Branch)
 	slog.Info("Resetting to " + gitLog.Commit + "~1")
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "reset", "--hard", gitLog.Commit+"~1")
 	slog.Info("Adding diff from commits " + gitLog.Branch)
-	diff := util.ExecuteOrDie(util.ExecuteOptions{}, "git", "diff", "--binary", commitToDiffFrom, gitLog.Branch)
-	util.ExecuteOrDie(
-		util.ExecuteOptions{Io: util.StdIo{In: strings.NewReader(diff), Out: nil, Err: nil}},
-		"git", "apply",
-	)
-	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "add", ".")
+	gitutil.ApplyDiffFromRef(commitToDiffFrom, gitLog.Branch)
 	commitSummary := util.ExecuteOrDie(util.ExecuteOptions{}, "git", "--no-pager", "show", "--no-patch", "--format=%s", gitLog.Commit)
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "commit", "--no-verify", "-m", strings.TrimSpace(commitSummary))
 	if len(commitsAfter) != 0 {

commands/command_replace_conflicts.go

@@ -35,16 +35,12 @@ func createReplaceConflictsCommand() *cobra.Command {
 // For failed rebase: replace changes with its associated branch.
 func replaceConflicts(confirmed bool) {
 	commitWithConflicts := getCommitWithConflicts()
-	gitLog := templates.GetBranchInfo(commitWithConflicts, templates.IndicatorTypeCommit)
+	gitLog := templates.ResolveCommitIndicator(commitWithConflicts, templates.IndicatorTypeCommit)
 	checkConfirmed(confirmed)
 	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "reset", "--hard", "HEAD")
 	slog.Info(fmt.Sprint("Replacing changes (merge conflicts) for failed rebase of commit ", commitWithConflicts, ", with changes from associated branch, ", gitLog.Branch))
-	diff := util.ExecuteOrDie(util.ExecuteOptions{}, "git", "diff", "--binary", "origin/"+gitutil.GetRemoteMainBranchOrDie(), gitLog.Branch)
-	util.ExecuteOrDie(util.ExecuteOptions{Io: util.StdIo{In: strings.NewReader(diff), Out: nil, Err: nil}},
-		"git", "apply",
-	)
+	gitutil.ApplyDiffFromRef("origin/"+gitutil.GetRemoteMainBranchOrDie(), gitLog.Branch)
 	slog.Info("Adding changes and continuing rebase")
-	util.ExecuteOrDie(util.ExecuteOptions{}, "git", "add", ".")
 	continueOptions := util.ExecuteOptions{EnvironmentVariables: []string{"GIT_EDITOR=true"}}
 	// Note: --continue cannot be used with --no-verify.
 	util.ExecuteOrDie(continueOptions, "git", "rebase", "--continue")
@@ -70,7 +66,11 @@ func getCommitWithConflicts() string {
 		panic("Cannot determine which commit is being rebased with because \"git status\" does not have a \"Last commands done\" section. To use this command you must be in the middle of a rebase")
 	}
 	// Return the 2nd field, from a string such as "pick f52e867 next1"
-	return strings.Fields(statusLines[lastCommandDoneLine])[1]
+	fields := strings.Fields(statusLines[lastCommandDoneLine])
+	if len(fields) < 2 {
+		panic("Cannot parse commit hash from git status line: " + statusLines[lastCommandDoneLine])
+	}
+	return fields[1]
 }
 
 func checkConfirmed(confirmed bool) {

commands/command_update.go

@@ -102,7 +102,7 @@ func updatePr(destCommit templates.GitLog, commitsToCherryPick []templates.GitLo
 		if cherryPickError != nil {
 			slog.Info("First attempt at cherry-pick failed")
 			util.ExecuteOrDie(util.ExecuteOptions{}, "git", "cherry-pick", "--abort")
-			rebaseCommit := gitutil.FirstOriginMainCommit(gitutil.GetLocalMainBranchOrDie())
+			rebaseCommit := gitutil.GetMergeBaseWithOriginMain(gitutil.GetLocalMainBranchOrDie())
 			slog.Info(fmt.Sprint("Rebasing with the base commit on "+gitutil.GetLocalMainBranchOrDie()+" branch, ", rebaseCommit,
 				", in case the local "+gitutil.GetLocalMainBranchOrDie()+" was rebased with origin/"+gitutil.GetRemoteMainBranchOrDie()))
 			gitutil.RebaseAndSkipAllEmptyOrDie(util.ExecuteOptions{Io: appConfig.Io}, rebaseCommit)

commands/command_worktree_move.go

@@ -94,10 +94,9 @@ func worktreeMove(args []string, indicatorTypeString *string, worktreeFlag strin
 	}
 	selectedCommits := getTargetCommits(args, indicatorTypeString, selectCommitOptions)
 	slog.Info(fmt.Sprint("Cherry-picking ", len(selectedCommits), " commit(s) onto ", mainBranch, " in main worktree"))
-	commits := make([]string, len(selectedCommits))
-	for i, commit := range selectedCommits {
-		commits[i] = commit.Commit
-	}
+	commits := util.MapSlice(selectedCommits, func(commit templates.GitLog) string {
+		return commit.Commit
+	})
 	cherryPickWithRecovery(mainPath, commits, cherryPickRecoveryOptions{
 		OnRollback: func() {
 			util.ExecuteOrDie(util.ExecuteOptions{}, "git", gitutil.PrependGitDir(mainPath, "cherry-pick", "--abort")...)

commands/get_target_commits.go

@@ -37,7 +37,7 @@ func getTargetCommits(
 	} else {
 		indicatorType := checkIndicatorFlag(indicatorTypeString)
 		return util.MapSlice(commitsFromCommandLine, func(commit string) templates.GitLog {
-			return templates.GetBranchInfo(commit, indicatorType)
+			return templates.ResolveCommitIndicator(commit, indicatorType)
 		})
 	}
 }