Skip to content

git: Support project-level git.inline_blame settings #43173

Open
leoliu0605 wants to merge 5 commits intozed-industries:mainfrom
leoliu0605:#13547/git-blame
Open

git: Support project-level git.inline_blame settings #43173
leoliu0605 wants to merge 5 commits intozed-industries:mainfrom
leoliu0605:#13547/git-blame

Conversation

@leoliu0605
Copy link
Contributor

@leoliu0605 leoliu0605 commented Nov 20, 2025

Closes #13547

We've limited the git blame command's thread usage, and following the issue discussion, we've added a project-level git.inline_blame setting to allow users to configure it for each project.

20251120_233903.mp4

Release Notes:

  • Added support for configuring the git.inline_blame setting at the project level

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Nov 20, 2025
@zed-industries-bot
Copy link
Contributor

zed-industries-bot commented Nov 20, 2025

Warnings
⚠️

This PR is missing release notes.

Please add a "Release Notes" section that describes the change:

Release Notes:

- Added/Fixed/Improved ...

If your change is not user-facing, you can use "N/A" for the entry:

Release Notes:

- N/A

Generated by 🚫 dangerJS against bcc25f8

@maxdeviant maxdeviant changed the title git: support project-level git.inline_blame settings git: Support project-level git.inline_blame settings Nov 20, 2025
@leoliu0605
Copy link
Contributor Author

Everything runs as expected, but an error message appears in the terminal and I don't know why:

image

@esthertrapadoux
Copy link

@leoliu0605 just following up to let you know the team went pretty deep in more git feature work and we got behind on PR reviews. We're ramping back up and appreciate the patience! 👍

@Anthony-Eid Anthony-Eid self-assigned this Dec 10, 2025
@cole-miller cole-miller removed their assignment Dec 15, 2025
Anthony-Eid pushed a commit that referenced this pull request Dec 18, 2025
Closes #13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
#43173 to be merged, then
modify it to support both user and project levels.
rtfeldman pushed a commit that referenced this pull request Jan 5, 2026
Closes #13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
#43173 to be merged, then
modify it to support both user and project levels.
@leoliu0605
Copy link
Contributor Author

Hi @Anthony-Eid , I've fix the merge conflic in this PR. We discussed it last time; if there are no further comments, please review and merge it. Thank you.

LivioGama pushed a commit to LivioGama/zed that referenced this pull request Jan 20, 2026
…s#43326)

Closes zed-industries#13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
zed-industries#43173 to be merged, then
modify it to support both user and project levels.
LivioGama pushed a commit to LivioGama/zed that referenced this pull request Jan 20, 2026
…s#43326)

Closes zed-industries#13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
zed-industries#43173 to be merged, then
modify it to support both user and project levels.
LivioGama pushed a commit to LivioGama/zed that referenced this pull request Feb 15, 2026
…s#43326)

Closes zed-industries#13304

Release Notes:

- Add global `git status` and `git diff` on/off in one place instead of
control everywhere

We can first review to ensure this change meets both `Zed` and user
requirements, as well as code rules. Currently, we only support
user-level settings. We can wait for this PR:
zed-industries#43173 to be merged, then
modify it to support both user and project levels.
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

Status: Community PRs

Development

Successfully merging this pull request may close these issues.

Inline blame for large files with long Git histories causes Zed to create more and more Git processes using >95% CPU

5 participants