diff --git a/crates/git/src/status.rs b/crates/git/src/status.rs index 7a993686011..31863a4b190 100644 --- a/crates/git/src/status.rs +++ b/crates/git/src/status.rs @@ -118,8 +118,8 @@ impl FileStatus { } .into(), [b'D', b'D'] => UnmergedStatus { - first_head: UnmergedStatusCode::Added, - second_head: UnmergedStatusCode::Added, + first_head: UnmergedStatusCode::Deleted, + second_head: UnmergedStatusCode::Deleted, } .into(), [x, b'U'] => UnmergedStatus { @@ -620,7 +620,9 @@ mod tests { use crate::{ repository::RepoPath, - status::{FileStatus, GitStatus, TreeDiff, TreeDiffStatus}, + status::{ + FileStatus, GitStatus, TreeDiff, TreeDiffStatus, UnmergedStatus, UnmergedStatusCode, + }, }; use super::{DiffStat, parse_numstat}; @@ -716,6 +718,34 @@ mod tests { ); } + #[test] + fn test_parse_unmerged_status_codes() { + use UnmergedStatusCode::{Added, Deleted, Updated}; + + let cases = [ + ("DD", Deleted, Deleted), + ("AU", Added, Updated), + ("UD", Updated, Deleted), + ("UA", Updated, Added), + ("DU", Deleted, Updated), + ("AA", Added, Added), + ("UU", Updated, Updated), + ]; + + for (code, first_head, second_head) in cases { + let status: GitStatus = format!("{code} conflicted.txt\0").parse().unwrap(); + assert_eq!(status.entries.len(), 1, "{code}"); + assert_eq!( + status.entries[0].1, + FileStatus::Unmerged(UnmergedStatus { + first_head, + second_head, + }), + "{code}" + ); + } + } + #[test] fn test_duplicate_untracked_entries() { // Regression test for ZED-2XA: git can produce duplicate untracked entries