Ensure that ddev does not treat worktrees as extra packages #20444
+345
−146
Conversation
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
This stack of pull requests is managed by Graphite. Learn more about stacking. |
3 tasks
AAraKKe
added
the
qa/skip-qa
Graphite App
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files
Flags with carried forward coverage won't be shown. Click here to find out more. 🚀 New features to boost your workflow:
|
AAraKKe
force-pushed
the
aarake/aarakke/fix-ddev-worktrees-behavior
branch
7 times, most recently
from
664d499 to
9db7543
Compare
AAraKKe
force-pushed
the
aarake/aarakke/fix-ddev-worktrees-behavior
branch
from
9db7543 to
ba1d03b
Compare
AAraKKe
force-pushed
the
aarake/aarakke/fix-ddev-worktrees-behavior
branch
from
ba1d03b to
215a615
Compare
NouemanKHAL
reviewed
Jul 22, 2025
Comment on lines
+112
to
+120
| def expected_worktrees(repo: Repository, include_root: bool, only_subpaths: bool) -> list[Path]: | ||
| result = [repo.path / "wt"] | ||
|
|
||
| if include_root: | ||
| result.append(repo.path) | ||
| if not only_subpaths: | ||
| result.append(repo.path.parent / "wt2") | ||
|
|
||
| return result |
There was a problem hiding this comment.
nit: I think it could be better to add the expected outcomes as hardcoded values in the pytest.mark.parametrize args, but this works fine too.
NouemanKHAL
approved these changes
Jul 22, 2025
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.
What does this PR do?
Updates ddev to ensure that when scaning packages in the repo, any git worktree found is not treated as a possible integration.
Motivation
When working with worktrees it is common to define the worktree as a folder within your repository directory. When ddev scans pacakges within the repo it checks all directory as possible integrations/packages, this includes worktrees folders. This triggers undesired side effect like slow linting and format checks. This is because
ddev test -salso runs on untracked items and worktrees will likely be untracked.Review checklist (to be filled by reviewers)
qa/skip-qalabel if the PR doesn't need to be tested during QA.backport/<branch-name>label to the PR and it will automatically open a backport PR once this one is merged