Skip to contentSkip to conversation

git gui: make current branch default in "remote delete branch" merge check

PATCH Superseded Heiko Voigt 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 git gui: make current branch default in "remote delete branch" merge check

---
 git-gui/lib/remote_branch_delete.tcl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
git-gui/lib/remote_branch_delete.tcl +7 -1
index 4e02fc0..9b119a7 100644
@@ -248,6 +248,8 @@ method _write_url        {args} { set urltype url    }
 method _write_check_head {args} { set checktype head }
 
 method _write_head_list {args} {
+	global current_branch
+
 	$head_m delete 0 end
 	foreach abr $head_list {
 		$head_m insert end radiobutton \
@@ -256,7 +258,11 @@ method _write_head_list {args} {
 			-variable @check_head
 	}
 	if {[lsearch -exact -sorted $head_list $check_head] < 0} {
-		set check_head {}
+		if {[lsearch -exact -sorted $head_list $current_branch] < 0} {
+			set check_head {}
+		} else {
+			set check_head $current_branch
+		}
 	}
 }
 
Signature · 1 line
1.6.5.rc1.10.g20f34