Skip to content
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
merged 13 commits into from May 14, 2024

Conversation

mrnugget
Copy link
Member

@mrnugget mrnugget commented May 8, 2024

TODOs:

  • Add assertions to the test to ensure that the git status is propagated
  • Get collaboration working
  • Test opening a git repository inside another git repository
  • Test opening the sub-folder of a repository that itself contains another git repository in a subfolder

Fixes:

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, ...) (#4672).

Demo video:

screenshot-2024-05-10-17.43.13.mp4

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label May 8, 2024
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
@claytonrcarter
Copy link
Contributor

Oh, yes, please! Most of my work is in subfolders of a monorepo, and I've been missing the git integrations. This will be great!

FYI, if I understand correctly, I think that this would close (or at least address) #10154, #8418, #8275, #7816, #6762, #4419, #4672, and #5161. Phew!

@mrnugget
Copy link
Member Author

Thanks for that listen @claytonrcarter!

@mrnugget mrnugget marked this pull request as ready for review May 14, 2024 16:19
@mrnugget mrnugget merged commit db89353 into main May 14, 2024
9 checks passed
@mrnugget mrnugget deleted the outside-root-git-dir branch May 14, 2024 16:34
@claytonrcarter
Copy link
Contributor

Just wanted to say thank you for this! I updated and rebuilt, and git integration is working great in my monorepo projects. Thank you! 🙏 🎉

@mrnugget
Copy link
Member Author

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