Skip to content

fix: Use -z option to git commands to handle unicode file paths #10844

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

Merged
merged 3 commits into from
Nov 18, 2025
+14 −4
Merged

fix: Use -z option to git commands to handle unicode file paths #10844

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aec046c
fix: Add -z option to git commands to handle Unicode file paths
hahnlee Sep 13, 2025
0d1246d
fix: empty string
hahnlee Sep 13, 2025
e2f1328
Merge branch 'main' into fix/diff
anthonyshew Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions crates/turborepo-scm/src/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ impl GitRepo {
"-r",
"--name-only",
"--no-commit-id",
"-z",
&valid_from,
to_commit,
];
Expand All @@ -311,13 +312,19 @@ impl GitRepo {
// Add untracked files or unstaged changes, i.e. files that are not in git at
// all
let ls_files_output = self.execute_git_command(
&["ls-files", "--others", "--modified", "--exclude-standard"],
&[
"ls-files",
"--others",
"--modified",
"--exclude-standard",
"-z",
],
pathspec,
)?;
self.add_files_from_stdout(&mut files, turbo_root, ls_files_output);
// Include any files that have been staged, but not committed
let diff_output =
self.execute_git_command(&["diff", "--name-only", "--cached"], pathspec)?;
self.execute_git_command(&["diff", "--name-only", "--cached", "-z"], pathspec)?;
self.add_files_from_stdout(&mut files, turbo_root, diff_output);
}

Expand Down Expand Up @@ -351,8 +358,8 @@ impl GitRepo {
turbo_root: &AbsoluteSystemPath,
stdout: Vec<u8>,
) {
let stdout = String::from_utf8(stdout).unwrap();
for line in stdout.lines() {
let stdout = String::from_utf8_lossy(&stdout);
for line in stdout.split('\0') {
let path = RelativeUnixPath::new(line).unwrap();
let anchored_to_turbo_root_file_path = self
.reanchor_path_from_git_root_to_turbo_root(turbo_root, path)
Expand Down
Loading