Git blame fails when using git-repo for code management

[zkun90]

Check for existing issues

• Completed

Describe the bug / provide steps to reproduce it

I use git-repo to manage multiple git repositories, the .git in the source code is a soft link to the .repo/projects/xxx.git, Zed cannot handle this situation when I use git blame, it will show the error message "Failed to blame "xxx.cpp": git blame process failed: fatal: not a git repository (or any for the parent direcotries): .git".

Environment

Zed: v0.159.5
OS: macOS 14.5
Memory: 18 GiB
Architecture: aarch64

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

No response

If applicable, attach your Zed.log file to this issue.

Zed.log

[notpeter]

What happens when you run git blame src/ble_characteristic.cpp from the root of your project? Because under the hood we are just spawning git blame:

zed/crates/git/src/blame.rs

Lines 85 to 90 in 0cb056c

	child
	.current_dir(working_directory)
	.arg("blame")
	.arg("--incremental")
	.arg("--contents")
	.arg("-")

Here's where that is failing:

zed/crates/git/src/blame.rs

Lines 120 to 127 in 0cb056c

	if !output.status.success() {
	let stderr = String::from_utf8_lossy(&output.stderr);
	let trimmed = stderr.trim();
	if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
	return Ok(String::new());
	}
	return Err(anyhow!("git blame process failed: {}", stderr));
	}

Could you enumerate the steps necessary to go from a couple empty directories to having the symlinks to git repos necessary to trigger this bug so I can test/reproduce?

[zkun90]

What happens when you run git blame src/ble_characteristic.cpp from the root of your project? Because under the hood we are just spawning git blame:

zed/crates/git/src/blame.rs

Lines 85 to 90 in 0cb056c

	child
	.current_dir(working_directory)
	.arg("blame")
	.arg("--incremental")
	.arg("--contents")
	.arg("-")

Here's where that is failing:

zed/crates/git/src/blame.rs

Lines 120 to 127 in 0cb056c

	if !output.status.success() {
	let stderr = String::from_utf8_lossy(&output.stderr);
	let trimmed = stderr.trim();
	if trimmed == GIT_BLAME_NO_COMMIT_ERROR || trimmed.contains(GIT_BLAME_NO_PATH) {
	return Ok(String::new());
	}
	return Err(anyhow!("git blame process failed: {}", stderr));
	}

Could you enumerate the steps necessary to go from a couple empty directories to having the symlinks to git repos necessary to trigger this bug so I can test/reproduce?

git blame works well when I run git blame xxx in the terminal.

Steps to reproduce this issue:

1. mkdir test
2. cd test
3. curl https://raw.githubusercontent.com/zkun90/git-repo/refs/heads/main/repo -o repo
4. chmod +x repo
5. export REPO_URL=https://github.com/zkun90/git-repo.git
6. export REPO_REV=main
7. ./repo init -u https://github.com/zkun90/test.git -m test.xml -b main
8. ./repo sync
9. ./repo start main --all
10. zed .
    Open workspace/test/test.xml in zed, run "toggle git blame" command.

[can2049]

in this way, the .git in everyt sub-dir ,is a soft link to .repo inside

[github-actions]

Hi there! 👋
We're working to clean up our issue tracker by closing older issues that might not be relevant anymore. If you are able to reproduce this issue in the latest version of Zed, please let us know by commenting on this issue, and we will keep it open. If you can't reproduce it, feel free to close the issue yourself. Otherwise, we'll close it in 7 days.
Thanks for your help!

[github-actions]

This issue was closed due to inactivity. If you're still experiencing this problem, please open a new issue with a link to this issue.