Skip to content

worktree: Fix git ignored directories dropping their contents when they are refreshed#44143

Merged
Veykril merged 2 commits intomainfrom
push-ttmklvrprwkr
Dec 4, 2025
Merged

worktree: Fix git ignored directories dropping their contents when they are refreshed#44143
Veykril merged 2 commits intomainfrom
push-ttmklvrprwkr

Conversation

@Veykril
Copy link
Member

@Veykril Veykril commented Dec 4, 2025

Closes #38653

Release Notes:

  • Fixed git ignored directories appearing as empty when their content changes on windows

Co-authored by: Smit Barmase smit@zed.dev

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Dec 4, 2025
@Veykril Veykril self-assigned this Dec 4, 2025
@Veykril Veykril merged commit 07af011 into main Dec 4, 2025
23 checks passed
@Veykril Veykril deleted the push-ttmklvrprwkr branch December 4, 2025 17:14
@Veykril
Copy link
Member Author

Veykril commented Dec 4, 2025

/cherry-pick preview

github-actions bot pushed a commit that referenced this pull request Dec 4, 2025
…ey are refreshed (#44143)

Closes #38653

Release Notes:

- Fixed git ignored directories appearing as empty when their content
changes on windows

Co-authored by: Smit Barmase <smit@zed.dev>
zed-zippy bot added a commit that referenced this pull request Dec 4, 2025
…ey are refreshed (#44143) (cherry-pick to preview) (#44170)

Cherry-pick of #44143 to preview

----
Closes #38653

Release Notes:

- Fixed git ignored directories appearing as empty when their content
changes on windows

Co-authored by: Smit Barmase <smit@zed.dev>

Co-authored-by: Lukas Wirth <lukas@zed.dev>
AlpSha pushed a commit to AlpSha/zed that referenced this pull request Dec 5, 2025
…ey are refreshed (zed-industries#44143)

Closes zed-industries#38653

Release Notes:

- Fixed git ignored directories appearing as empty when their content
changes on windows

Co-authored by: Smit Barmase <smit@zed.dev>
CherryWorm pushed a commit to CherryWorm/zed that referenced this pull request Dec 16, 2025
…ey are refreshed (zed-industries#44143)

Closes zed-industries#38653

Release Notes:

- Fixed git ignored directories appearing as empty when their content
changes on windows

Co-authored by: Smit Barmase <smit@zed.dev>
someone13574 pushed a commit to someone13574/zed that referenced this pull request Dec 16, 2025
…ey are refreshed (zed-industries#44143)

Closes zed-industries#38653

Release Notes:

- Fixed git ignored directories appearing as empty when their content
changes on windows

Co-authored by: Smit Barmase <smit@zed.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Windows Beta: Git-ignored folder contents disappear with incorrect strikethrough in file tabs

2 participants