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.

Sign up for GitHub

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

Jump to bottom

Changes aren't tracked if folder opened is inside git repository #5161

Closed
1 task done
thoradam opened this issue Oct 26, 2022 · 0 comments · Fixed by #11550
Closed
1 task done

Changes aren't tracked if folder opened is inside git repository #5161

thoradam opened this issue Oct 26, 2022 · 0 comments · Fixed by #11550
Assignees
@ForLoveOfCats
Labels
bug [core label] git Git integration feedback

Comments

@thoradam
Copy link

Check for existing issues

  • Completed

Describe the bug / provide steps to reproduce it

  1. Open a folder somewhere inside a git repository but not the root
  2. Make changes to a file
  3. Git gutter is not visible

Expected behavior

Git gutter should be visible

Environment

Zed 0.61.1 – /Applications/Zed.app 
macOS 13.0 
architecture arm64

If applicable, add mockups / screenshots to help explain present your vision of the feature

No response

If applicable, attach your ~/Library/Logs/Zed/Zed.log file to this issue

No response
@thoradam thoradam added bug [core label] triage labels Oct 26, 2022
@ForLoveOfCats ForLoveOfCats self-assigned this Nov 7, 2022
@ForLoveOfCats ForLoveOfCats changed the title Changes aren't tracked if opened folder is not root of the git repository Changes aren't tracked if folder opened is inside git repository Dec 19, 2022
@dlindenkreuz dlindenkreuz mentioned this issue Nov 6, 2023
Open
1 task
@JosephTLyons JosephTLyons transferred this issue from zed-industries/community Jan 24, 2024
@github-actions github-actions bot mentioned this issue Jan 26, 2024
Open
@esamattis esamattis mentioned this issue Jan 28, 2024
Closed
1 task
@d1y d1y mentioned this issue Jan 28, 2024
Closed
1 task
@JosephTLyons JosephTLyons mentioned this issue Apr 19, 2024
Closed
1 task
@claytonrcarter claytonrcarter mentioned this issue May 10, 2024
Merged
4 tasks
osiewicz pushed a commit to RemcoSmitsDev/zed that referenced this issue May 18, 2024
@mrnugget @osiewicz
git: Support git repos with .git folder above project root (zed-indus…
265d3b4 
…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
Assignees

@ForLoveOfCats ForLoveOfCats

Labels
bug [core label] git Git integration feedback
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

git: Support git repos with .git folder above project root zed-industries/zed
2 participants
@thoradam @ForLoveOfCats