gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-25 07:45:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

hunk ownership: use line numbers in eq check

Browse Source 
Now that line numbers are set correctly, re-introducing the equality check based on line numbers
This commit is contained in:
Kiril Videlov 2024-03-26 01:44:33 +01:00
parent 104574b9bd
commit 93acbb4421
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gitbutler-app/src/virtual_branches/branch/hunk.rs
View File

@ -26,7 +26,7 @@ impl From<&diff::GitHunk> for Hunk {
impl PartialEq for Hunk {
fn eq(&self, other: &Self) -> bool {
if self.hash.is_some() && other.hash.is_some() {
self.hash == other.hash
self.hash == other.hash && self.start == other.start && self.end == other.end
} else {
self.start == other.start && self.end == other.end
}
@ -233,7 +233,7 @@ mod tests {
(
"1-2-abc".parse::<Hunk>().unwrap(),
"2-3-abc".parse::<Hunk>().unwrap(),
true,
false,
),
(
"1-2".parse::<Hunk>().unwrap(),