Skip to content

Add safe Windows pull preflight workflow - #119

Merged
1lck merged 4 commits into
1lck:preview/0.3.0from
yangboxuan726:feat/windows-git-pull-preflight
Aug 17, 2026
Merged

Add safe Windows pull preflight workflow#119
1lck merged 4 commits into
1lck:preview/0.3.0from
yangboxuan726:feat/windows-git-pull-preflight

Conversation

@yangboxuan726

@yangboxuan726 yangboxuan726 commented Aug 17, 2026

Copy link
Copy Markdown

Summary

  • Route every Windows Source Control Pull entry through one Fetch → preflight → policy → Pull → refresh workflow.
  • Block missing upstreams, up-to-date branches, and dirty working trees with actionable messages.
  • Use ffOnly when only the upstream is ahead; require an explicit Merge, Rebase, or safe-default Cancel choice when histories diverge.
  • Reuse the existing merge/rebase operation banner when Pull stops for conflict resolution.
  • Keep the command-palette compatibility entry on the same safety path, defaulting divergent headless requests to Cancel.

User impact

Pull no longer relies on stale remote refs or implicit Git reconciliation settings. All visible Source Control entry points share busy/deduplication state, error text, strategy selection, and a complete working-tree/history/refs/remotes refresh.

Validation

  • Isolated Bun tests: 20 passed, 0 failed
  • bun run typecheck
  • .\scripts\verify-windows-boundaries.ps1
  • .\scripts\build-windows.ps1 -Configuration Release
  • cargo test --manifest-path windows/tauri/src-tauri/Cargo.toml (36 passed)
  • git diff --check
  • Dirty-guard mutation check: expected red, then green after restoration
  • Real bare remote + two-clone acceptance: ffOnly, divergent Cancel, Rebase, Merge, and dirty block
  • Actual Windows Tauri run against a real divergent temporary repository

UI

Actual Windows Tauri runtime against a real divergent temporary repository. Source Control shows a clean working tree, local ahead 2 / remote ahead 1, and the explicit Cancel / Rebase / Merge choice.

Windows Source Control divergent Pull strategy dialog

@yangboxuan726
yangboxuan726 force-pushed the feat/windows-git-pull-preflight branch 2 times, most recently from 0b88e0c to a6cf441 Compare August 17, 2026 02:58
@yangboxuan726
yangboxuan726 force-pushed the feat/windows-git-pull-preflight branch from a6cf441 to d80e9d7 Compare August 17, 2026 03:23
@yangboxuan726
yangboxuan726 marked this pull request as ready for review August 17, 2026 03:47
@yangboxuan726
yangboxuan726 requested a review from 1lck as a code owner August 17, 2026 03:47
@1lck
1lck merged commit c33cfbd into 1lck:preview/0.3.0 Aug 17, 2026
6 checks passed
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.

2 participants