Skip to content

Commit

Permalink
Merge pull request #4451 from gitbutlerapp/rm-commented-code
Browse files Browse the repository at this point in the history
remove commented out code
  • Loading branch information
krlvi authored Jul 20, 2024
2 parents 2cf0c97 + e41ff19 commit 4654529
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions crates/gitbutler-branch-actions/src/virtual.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1322,22 +1322,11 @@ pub(crate) fn get_applied_status(
default_vbranch_pos
};

// let hash = Hunk::hash_diff(&hunk.diff_lines);
// let mut new_hunk = Hunk::from(&hunk).with_hash(hash);
// new_hunk.locked_to = match locked_to {
// Some(locked_to) => locked_to.clone(),
// _ => vec![],
// };

virtual_branches[vbranch_pos].ownership.put(OwnershipClaim {
file_path: filepath.clone(),
hunks: vec![Hunk::from(&hunk).with_hash(Hunk::hash_diff(&hunk.diff_lines))],
});

// let hunk = match locked_to {
// Some(locks) => hunk.with_locks(locks),
// _ => hunk,
// };
diffs_by_branch
.entry(virtual_branches[vbranch_pos].id)
.or_default()
Expand Down

0 comments on commit 4654529

Please sign in to comment.