Skip to content

gh stack doctor: detect and fix stale fork points #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cds-amal wants to merge 16 commits into
base: main
Choose a base branch
from
Open

gh stack doctor: detect and fix stale fork points #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
596cc29
fix(e2e): use explicit default branch in test setup
cds-amal Feb 14, 2026
d4f0da9
feat(git): add IsAncestor and GetForkPoint methods
cds-amal Feb 14, 2026
04436c0
feat: add `gh stack doctor` command
cds-amal Feb 14, 2026
8fa4870
test(e2e): add doctor command tests
cds-amal Feb 14, 2026
3e9f97a
fix(git): distinguish exit code 1 from errors in IsAncestor
cds-amal Feb 14, 2026
62bd7f1
docs(git): fix misleading GetForkPoint docstring
cds-amal Feb 14, 2026
5997c33
fix(doctor): handle IsAncestor errors instead of discarding them
cds-amal Feb 14, 2026
801ca3d
fix(doctor): report GetMergeBase failures instead of marking healthy
cds-amal Feb 14, 2026
019376d
fix(doctor): resolve config path for linked worktrees
cds-amal Feb 14, 2026
f4855a5
fix(doctor): preserve config file permissions and skip no-op writes
cds-amal Feb 14, 2026
16745d5
fix(doctor): detect missing trunk branch
cds-amal Feb 14, 2026
9d7018c
style(doctor): use s.Error for "No fork point stored" message
cds-amal Feb 14, 2026
58bdd62
refactor(doctor): extract reusable branch health validation into inte…
cds-amal Feb 14, 2026
c5d8fab
refactor(doctor): replace hand-rolled INI parsing with git config --c…
cds-amal Feb 14, 2026
cf051a3
fix(doctor): address PR feedback
cds-amal Feb 15, 2026
cf48383
refactor(config): route all git calls through internal/git.Git
cds-amal Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/adopt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
10 changes: 5 additions & 5 deletions cmd/adopt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions cmd/cascade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'")
Expand Down
2 changes: 1 addition & 1 deletion cmd/continue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 3 additions & 3 deletions cmd/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
15 changes: 7 additions & 8 deletions cmd/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading