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

Merge pull request #1444 from gitbutlerapp/proxy-virtual-branch-with-upstream

Browse Source 
🔨 chore: add support for proxying upstream branch in `proxy_virtual_b…
This commit is contained in:
Nikita Galaiko 2023-10-23 15:29:04 +02:00 committed by GitHub
commit c3f63b5b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/tauri/src/assets.rs
View File

@ -75,6 +75,11 @@ impl Proxy {
pub async fn proxy_virtual_branch(&self, branch: VirtualBranch) -> VirtualBranch {
VirtualBranch {
upstream: if let Some(upstream) = branch.upstream {
Some(self.proxy_remote_branch(upstream).await)
} else {
None
},
commits: join_all(
branch
.commits