gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-30 01:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4508 from gitbutlerapp/no-more-multiple-local-branches-for-the-same-vbranch

Browse Source 
remove the vec of local branch entries from branch data
This commit is contained in:
Kiril Videlov 2024-07-27 17:24:58 +02:00 committed by GitHub
commit f064e31d3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/gitbutler-branch-actions/src/branch.rs
View File

@ -398,10 +398,8 @@ pub struct VirtualBranchReference {
pub struct BranchData {
/// The branch that this data is associated with
pub branch: BranchListing,
/// Sometimes the app creates additional new branches when unapplying a virtual branch, usually suffixed with a counter.
/// This is either done by the user to avoid overriding when unapplying or by the app when dealing with conflicts.
/// TODO: In general we should make the app not need these and instead have only one associated local branch at any given time.
pub local_branches: Vec<LocalBranchEntry>,
/// A local branch entry. At most one
pub local_branch: Option<LocalBranchEntry>,
/// A branch may have multiple remote tracking branches associated with it, from different remotes.
/// The name of the branch is the same, but the remote could be different as well as the head commit.
pub remote_branches: Vec<RemoteBranchEntry>,