gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-19 23:52:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: update type of current_sha field in Branch struct to git::Oid to match the actual type of the value

Browse Source
This commit is contained in:
Nikita Galaiko 2024-01-26 14:37:48 +01:00 committed by GitButler
parent 91cd79687e
commit 284448e594
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/base.rs
View File

@ -27,7 +27,7 @@ pub struct BaseBranch {
pub remote_name: String, pub remote_name: String,
pub remote_url: String, pub remote_url: String,
pub base_sha: git::Oid, pub base_sha: git::Oid,
pub current_sha: String, pub current_sha: git::Oid,
pub behind: usize, pub behind: usize,
pub upstream_commits: Vec<RemoteCommit>, pub upstream_commits: Vec<RemoteCommit>,
pub recent_commits: Vec<RemoteCommit>, pub recent_commits: Vec<RemoteCommit>,
@ -549,7 +549,7 @@ pub fn target_to_base_branch(
remote_name: target.branch.remote().to_string(), remote_name: target.branch.remote().to_string(),
remote_url: target.remote_url.clone(), remote_url: target.remote_url.clone(),
base_sha: target.sha, base_sha: target.sha,
current_sha: oid.to_string(), current_sha: oid,
behind: upstream_commits.len(), behind: upstream_commits.len(),
upstream_commits, upstream_commits,
recent_commits, recent_commits,