gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-02 22:42:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

rm unnecessary borrows

Browse Source
This commit is contained in:
Kiril Videlov 2024-07-02 11:22:08 +03:00
parent a240a16cc5
commit 25aceb2520
No known key found for this signature in database
GPG Key ID: A4C733025427C471
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/gitbutler-core/src/git/diff.rs
View File

@ -410,10 +410,10 @@ fn reverse_patch(patch: &BStr) -> Option<BString> {
return None;
}
} else if line.starts_with(b"+") {
reversed.push_str(&line.replacen(b"+", b"-", 1));
reversed.push_str(line.replacen(b"+", b"-", 1));
reversed.push(b'\n');
} else if line.starts_with(b"-") {
reversed.push_str(&line.replacen(b"-", b"+", 1));
reversed.push_str(line.replacen(b"-", b"+", 1));
reversed.push(b'\n');
} else {
reversed.push_str(line);

2
crates/gitbutler-core/src/ops/oplog.rs
View File

@ -107,7 +107,7 @@ impl Project {
let commit_tree_id = commit_tree_builder.write()?;
commits_tree_builder.insert(
&commit_id.to_string(),
commit_id.to_string(),
commit_tree_id,
FileMode::Tree.into(),
)?;

2
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -3739,7 +3739,7 @@ fn update_conflict_markers(
}
}
if !conflicted {
conflicts::resolve(project_repository, &file_path.display().to_string()).unwrap();
conflicts::resolve(project_repository, file_path.display().to_string()).unwrap();
}
}
}