Merge pull request #5356 from gitbutlerapp/kv-branch-1

Emit virtual branches after fetch
This commit is contained in:
Kiril Videlov 2024-10-29 19:04:57 +01:00 committed by GitHub
commit 0721250234
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -492,8 +492,9 @@ pub mod commands {
} }
#[tauri::command(async)] #[tauri::command(async)]
#[instrument(skip(projects), err(Debug))] #[instrument(skip(projects, windows), err(Debug))]
pub fn fetch_from_remotes( pub fn fetch_from_remotes(
windows: State<'_, WindowState>,
projects: State<'_, projects::Controller>, projects: State<'_, projects::Controller>,
project_id: ProjectId, project_id: ProjectId,
action: Option<String>, action: Option<String>,
@ -520,6 +521,7 @@ pub mod commands {
return Err(anyhow!(error).into()); return Err(anyhow!(error).into());
} }
emit_vbranches(&windows, project_id);
let base_branch = gitbutler_branch_actions::get_base_branch_data(&project)?; let base_branch = gitbutler_branch_actions::get_base_branch_data(&project)?;
Ok(base_branch) Ok(base_branch)
} }