oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve handling of remote-tracking branches in the picker (#29744)

Browse Source 
Release Notes:

- Changed the git branch picker to make remote-tracking branches less
prominent

---------

Co-authored-by: Anthony Eid <hello@anthonyeid.me>
This commit is contained in:
Cole Miller
2025-05-01 21:24:26 -04:00
committed by GitHub
co-authored by Anthony Eid
parent 92b9ecd7d2
commit e1e3f2e423
13 changed files with 150 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/git_ui/src/project_diff.rs
+3 -3
View File
@@ -1099,7 +1099,7 @@ impl RenderOnce for ProjectDiffEmptyState {
v_flex()
.child(Headline::new(ahead_string).size(HeadlineSize::Small))
.child(
Label::new(format!("Push your changes to {}", branch.name))
Label::new(format!("Push your changes to {}", branch.name()))
.color(Color::Muted),
),
)
@@ -1113,7 +1113,7 @@ impl RenderOnce for ProjectDiffEmptyState {
v_flex()
.child(Headline::new("Publish Branch").size(HeadlineSize::Small))
.child(
Label::new(format!("Create {} on remote", branch.name))
Label::new(format!("Create {} on remote", branch.name()))
.color(Color::Muted),
),
)
@@ -1183,7 +1183,7 @@ mod preview {
fn branch(upstream: Option<UpstreamTracking>) -> Branch {
Branch {
is_head: true,
name: "some-branch".into(),
ref_name: "some-branch".into(),
upstream: upstream.map(|tracking| Upstream {
ref_name: "origin/some-branch".into(),
tracking,