Skip to content

Delphi 2.0.0: migrate a bare repos/<name> to the worktree store - #83

Merged
bracyw merged 1 commit into
mainfrom
migrate-bare-repos
Oct 25, 2026
Merged

bracyw merged 1 commit into
mainfrom
migrate-bare-repos

Conversation

@bracyw

@bracyw bracyw commented Oct 24, 2026

Copy link
Copy Markdown
Contributor

Changes

Migration 2.0.0-bare-repos-to-worktree-store.sh moves a pre-1.1.0 bare repos/<name> to worktrees/<name>/.bare (the 1.2.0 store), runs git worktree repair so its worktrees follow, sets origin/HEAD, and vacates repos/<name> for setup.sh to clone normally. Without it new-worktree.sh fails with "no worktrees//.bare".

Testing

  • New e2e: a bare repo with an unpushed detached worktree is skipped with a message and left bare
  • New e2e: after that is pushed or removed, the repo is moved, worktrees still work and are registered to .bare, origin/HEAD is set, repos/<name> is gone, and a second run does nothing
  • Legacy "older bare store is left as it is" e2e now expects the move
  • bash tests/e2e.sh (121 checks) and ci/check.sh pass on macOS

Notes

  • MAJOR bump (2.0.0): a migration requires it from 1.0.
  • Moving beats re-creating worktrees: existing ones stay valid via git worktree repair. Tested on macOS, not Git Bash.
  • A skip (no origin, work not on origin, .bare already exists, fetch failed) exits 0 so setup continues and records 2.0.0; it is not retried, and the message says to move it by hand.
  • Unrelated fix: two e2e worktree list | wc -l checks failed on macOS from wc padding; now tr -d " ".

Checklist

  • ci/check.sh . and bash tests/e2e.sh pass
  • Version bumped if a .delphi/manifest.yml file changed
  • No merge conflicts
  • Request reviewers & ping on Slack

…ree store worktrees/<name>/.bare, with its worktrees (migration)
@bracyw bracyw added the by: ai Written by AI label Oct 24, 2026
@bracyw
bracyw merged commit 4e355dc into main Oct 25, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

by: ai Written by AI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant