Skip to content

git: skip status entries with non-UTF-8 paths instead of panicking #1210

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

Open
SAY-5 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

git: skip status entries with non-UTF-8 paths instead of panicking #1210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ impl GitCache {
match repo.statuses(None) {
Ok(status_list) => {
for status_entry in status_list.iter() {
// git2-rs returns `None` from `.path()` when the filename
// bytes from libgit2 are not valid UTF-8. Skip those rather
// than panicking; the file still appears in the listing,
// just without a Git status indicator.
let Some(str_path) = status_entry.path() else {
continue;
};
// git2-rs provides / separated path even on Windows. We have to rebuild it
let str_path = status_entry.path().unwrap();
let path: PathBuf =
str_path.split('/').collect::<Vec<_>>().iter().collect();
let path = workdir.join(path);
Expand Down