Merge b60ad73da5 into a102b08743

2025-08-25 12:19:07 -04:00 · 2025-08-25 12:19:07 -04:00 · b7bf25ad90
commit b7bf25ad90
parent a102b08743 b60ad73da5
1 changed files with 7 additions and 4 deletions
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@ -122,10 +122,13 @@ impl BranchList {
                    all_branches.retain(|branch| !remote_upstreams.contains(&branch.ref_name));

                    all_branches.sort_by_key(|branch| {
-                        branch
-                            .most_recent_commit
-                            .as_ref()
-                            .map(|commit| 0 - commit.commit_timestamp)
+                        (
+                            !branch.is_head, // Current branch (is_head=true) comes first
+                            branch
+                                .most_recent_commit
+                                .as_ref()
+                                .map(|commit| 0 - commit.commit_timestamp),
+                        )
                    });

                    all_branches