New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git: Support git repos with .git folder above project root #11550
Merged
Conversation
This file contains 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
cla-bot
bot
added
the
cla-signed
The user has signed the Contributor License Agreement
label
May 8, 2024
mrnugget
force-pushed
the
outside-root-git-dir
branch
from
May 10, 2024 08:12
5244c1d
to
0c4407c
Compare
mrnugget
added a commit
that referenced
this pull request
May 10, 2024
I ran into this when trying to get #11550 working: the VCS menu would open repositories on its owned, based on paths, instead of going through the worktree on which we already store the git repositories.
mrnugget
added a commit
that referenced
this pull request
May 10, 2024
I ran into this when trying to get #11550 working: the VCS menu would open repositories on its owned, based on paths, instead of going through the worktree on which we already store the git repositories. Release Notes: - N/A
Thanks for that listen @claytonrcarter! |
mrnugget
force-pushed
the
outside-root-git-dir
branch
from
May 10, 2024 15:52
c03a0db
to
f960dce
Compare
1 task
mrnugget
force-pushed
the
outside-root-git-dir
branch
from
May 14, 2024 14:04
340d08b
to
002e5cb
Compare
Just wanted to say thank you for this! I updated and rebuilt, and git integration is working great in my monorepo projects. Thank you! 🙏 🎉 |
Great to hear, @claytonrcarter! Let me know if you bump into any issues :) |
osiewicz
pushed a commit
to RemcoSmitsDev/zed
that referenced
this pull request
May 18, 2024
…tries#11652) I ran into this when trying to get zed-industries#11550 working: the VCS menu would open repositories on its owned, based on paths, instead of going through the worktree on which we already store the git repositories. Release Notes: - N/A
osiewicz
pushed a commit
to RemcoSmitsDev/zed
that referenced
this pull request
May 18, 2024
…tries#11550) TODOs: - [x] Add assertions to the test to ensure that the git status is propagated - [x] Get collaboration working - [x] Test opening a git repository inside another git repository - [x] Test opening the sub-folder of a repository that itself contains another git repository in a subfolder Fixes: - Fixes zed-industries#10154 - Fixes zed-industries#8418 - Fixes zed-industries#8275 - Fixes zed-industries#7816 - Fixes zed-industries#6762 - Fixes zed-industries#4419 - Fixes zed-industries#4672 - Fixes zed-industries#5161 Release Notes: - Added support for opening subfolders of git repositories and treating them as part of a repository (show git status in project panel, show git diff in gutter, git blame works, ...) ([zed-industries#4672](zed-industries#4672)). Demo video: https://github.com/zed-industries/zed/assets/1185253/afc1cdc3-372c-404e-99ea-15708589251c
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.
TODOs:
Fixes:
git.openRepositoryInParentFolders
= 'always' #6762Release Notes:
Demo video:
screenshot-2024-05-10-17.43.13.mp4