Skip to content

Push only diverged stack branches#21

Merged
brdv merged 1 commit intomainfrom
push-only-diverged-branches
Feb 11, 2026
Merged

Push only diverged stack branches#21
brdv merged 1 commit intomainfrom
push-only-diverged-branches

Conversation

@brdv
Copy link
Owner

@brdv brdv commented Feb 11, 2026

Summary

Make stck push force-push only branches that actually diverged from origin, while still applying planned retargets.

Changelist

  • src/cli.rs
    • During push-state creation, filter candidate push branches using gitops::branch_needs_push.
    • Keep retarget behavior unchanged and still ordered after pushes.
  • tests/cli_skeleton.rs
    • Extended test stub to support multiple diverged branches via STCK_TEST_NEEDS_PUSH_BRANCHES.
    • Updated existing push tests to set divergence where pushes are expected.
    • Added regression test push_skips_branches_without_local_changes.

Validation

  • cargo fmt --all
  • cargo clippy --all-targets --all-features -- -D warnings
  • cargo test --all-features

@brdv brdv force-pushed the push-fetch-before-operations branch from b7ff71d to 4ade1a1 Compare February 11, 2026 11:27
Base automatically changed from push-fetch-before-operations to main February 11, 2026 11:28
@brdv brdv force-pushed the push-only-diverged-branches branch from 756ebd2 to 1d174ba Compare February 11, 2026 11:28
@brdv brdv merged commit c8bd6e6 into main Feb 11, 2026
1 check passed
@brdv brdv deleted the push-only-diverged-branches branch February 11, 2026 11:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant