From b60ad73da524b5d1c7aeef9e93b67a1e4f2ba930 Mon Sep 17 00:00:00 2001
From: Guillaume Launay <guillaume.launay@paylead.fr>
Date: Sat, 26 Jul 2025 22:05:37 +0200
Subject: [PATCH] Current branch first in branch picker

---
 crates/git_ui/src/branch_picker.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/git_ui/src/branch_picker.rs b/crates/git_ui/src/branch_picker.rs
index 9eac3ce5af..6fc5ffb294 100644
--- a/crates/git_ui/src/branch_picker.rs
+++ b/crates/git_ui/src/branch_picker.rs
@@ -112,10 +112,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