fix: improve status detection for in-progress and closed workspaces#18
Merged
fix: improve status detection for in-progress and closed workspaces#18
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
in-progresscheck to detect branches with commits ahead of the default branch (not just unpushed commits or dirty working tree)closedcheck to guard against false positives from stale merged PRs with the same branch nameskipfield in status spec so repos on the default branch are excluded from status aggregationFetch()to createorigin/mainandorigin/HEADtracking refs in bare-clone worktrees so status checks can reliably compare against the default branchWhy
Two bugs in
flow status:openinstead ofin-progress— the check only compared local HEAD vs remote tracking branch, missing the "branch diverged from default" caseclosedwhen they had active uncommitted work, because a stale merged PR with the same branch name existed — the check didn't verify the branch had no remaining divergence from the default branchAdditionally, the
skipfield was defined in~/.flow/status.yamlbut never parsed or evaluated, so repos tracking the default branch (e.g.main) polluted workspace status aggregation.Ref
Bare-clone worktrees don't create
refs/remotes/origin/*by default, soorigin/mainwas unavailable for comparisons. The fix creates a targeted tracking ref for just the default branch during fetch (avoiding case-conflict errors on macOS from repos with case-colliding branch names).