Skip to content

Fix/backup sync divergence#1226

Merged
perber merged 1 commit into
mainfrom
fix/backup-sync-divergence
Jun 30, 2026
Merged

Fix/backup sync divergence#1226
perber merged 1 commit into
mainfrom
fix/backup-sync-divergence

Conversation

@perber

@perber perber commented Jun 29, 2026

Copy link
Copy Markdown
Owner

No description provided.

- Fetch remote objects + repoint HEAD without touching working tree when
  .git is missing but remote has content (replaces destructive PlainClone
  that would overwrite local files)
- Clean up partial .git on initWithRemoteHistory failure so retries never
  hit "repository already exists"
- Track lastPushedHash to prevent spurious non-fast-forward push errors
- Init repo with correct branch name; migrate existing repos on startup
- Trigger wiki resync after pulling remote changes
- Revert OnRemoteChanges auto-resync (caused unintended resync loops)
- Deduplicate push/ForcePush paths; use errors.Is for NoErrAlreadyUpToDate
- ForcePush: TryLock to avoid blocking HTTP handlers for up to 4 min
- initWithRemoteHistory: ListContext/FetchContext with network timeout
- errRemoteBranchNotFound: proper sentinel instead of misused transport err
- Poll backup alert every 30s; fix warning indicator visibility on mobile
- Prevent content blink on background status refresh (initialLoadDone flag)
- Localize all backup UI strings into dedicated backup i18n namespace
- Update README
@perber
perber force-pushed the fix/backup-sync-divergence branch from 058fd34 to 8eed9fd Compare June 30, 2026 14:55
@perber
perber merged commit 58a3c02 into main Jun 30, 2026
9 checks passed
@perber
perber deleted the fix/backup-sync-divergence branch June 30, 2026 14:56
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