Skip to content

git: Fix panic on duplicate status entries in git status parsing #49191

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
cole-miller merged 1 commit into from
Feb 24, 2026
Merged

git: Fix panic on duplicate status entries in git status parsing #49191

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
19 changes: 17 additions & 2 deletions crates/git/src/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,12 @@ impl FromStr for GitStatus {
}
.into();
}
_ => panic!("Unexpected duplicated status entries: {a_status:?} and {b_status:?}"),
(x, y) if x == y => {}
_ => {
log::warn!(
"Unexpected duplicated status entries: {a_status:?} and {b_status:?}"
);
}
}
true
});
Expand Down Expand Up @@ -580,9 +585,19 @@ mod tests {

use crate::{
repository::RepoPath,
status::{TreeDiff, TreeDiffStatus},
status::{FileStatus, GitStatus, TreeDiff, TreeDiffStatus},
};

#[test]
fn test_duplicate_untracked_entries() {
// Regression test for ZED-2XA: git can produce duplicate untracked entries
// for the same path. This should deduplicate them instead of panicking.
let input = "?? file.txt\0?? file.txt";
let status: GitStatus = input.parse().unwrap();
assert_eq!(status.entries.len(), 1);
assert_eq!(status.entries[0].1, FileStatus::Untracked);
}

#[test]
fn test_tree_diff_parsing() {
let input = ":000000 100644 0000000000000000000000000000000000000000 0062c311b8727c3a2e3cd7a41bc9904feacf8f98 A\x00.zed/settings.json\x00".to_owned() +
Expand Down