From 8553b772d7aeebe8c83710233877483dd409b846 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <spearce@spearce.org>
Date: Fri, 24 Nov 2006 15:38:18 -0500
Subject: [PATCH] git-gui: Display the current branch.
Users want to know what branch they are sitting on before making a commit,
as they may need to switch to a different branch first.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
git-gui | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/git-gui b/git-gui
index 34a1daa44d..dd2d750ab1 100755
--- a/git-gui
+++ b/git-gui
@@ -258,11 +258,20 @@ proc unlock_index {} {
## status
proc repository_state {ctvar hdvar mhvar} {
- global gitdir
+ global gitdir current_branch
upvar $ctvar ct $hdvar hd $mhvar mh
set mh [list]
+ if {[catch {set current_branch [exec git symbolic-ref HEAD]}]} {
+ set current_branch {}
+ } else {
+ regsub ^refs/(heads|tags)/ \
+ $current_branch \
+ {} \
+ current_branch
+ }
+
if {[catch {set hd [exec git rev-parse --verify HEAD]}]} {
set hd {}
set ct initial
@@ -3060,6 +3069,25 @@ if {[is_MacOSX]} {
}
+# -- Branch Control
+#
+frame .branch \
+ -borderwidth 1 \
+ -relief sunken
+label .branch.l1 \
+ -text {Current Branch:} \
+ -anchor w \
+ -justify left \
+ -font font_ui
+label .branch.cb \
+ -textvariable current_branch \
+ -anchor w \
+ -justify left \
+ -font font_ui
+pack .branch.l1 -side left
+pack .branch.cb -side left -fill x
+pack .branch -side top -fill x
+
# -- Main Window Layout
#
panedwindow .vpane -orient vertical
@@ -3486,6 +3514,7 @@ set PARENT {}
set MERGE_HEAD [list]
set commit_type {}
set empty_tree {}
+set current_branch {}
set current_diff {}
set selected_commit_type new
--
2.40.0