Fix ddev -x/--here repo type detection in worktrees#22715
Draft
Fix ddev -x/--here repo type detection in worktrees#22715
Conversation
Fix local -x/--here flows so worktrees detect the correct repo type (core/extras/marketplace) instead of inferring from directory name. Add regression tests for repo mapping and core model header preservation.
Rename the ddev towncrier fragment from 99999.fixed to 22715.fixed to match the opened PR.
This comment has been minimized.
This comment has been minimized.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files🚀 New features to boost your workflow:
|
Apply ddev test --fmt output to the updated validate models regression test so linting passes cleanly.
Set repo_choice/repo_name in the ddev-to-legacy bridge before initialize_root so --here remains stable when DDEV_ROOT or leaked root state causes early return, and add regressions to isolate root state and cover the DDEV_ROOT path.
Run the --here + DDEV_ROOT test without --sync so it verifies repo metadata wiring without writing model files, while still accepting both in-sync and out-of-sync outcomes.
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.
Summary
Fix
ddev -xorddev --herelogic so that repo identity comes from configured repo (core/extras/marketplace) instead of the directory name.This misidentification commonly shows up when using Git worktrees, since worktree folders often don’t match the primary repo directory name (e.g., not named integrations-core).
One consequence is that model regeneration in integrations-core can incorrectly strip license headers.