From c0d153295c6f9140e644aa740f588257aac1f825 Mon Sep 17 00:00:00 2001 From: Heiko Voigt Date: Fri, 4 Dec 2009 22:26:48 +0100 Subject: [PATCH] git gui: make current branch default in "remote delete branch" merge check We already do the same when locally deleting a branch. Signed-off-by: Heiko Voigt Signed-off-by: Shawn O. Pearce --- lib/remote_branch_delete.tcl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl index 31e0947488..241642062e 100644 --- a/lib/remote_branch_delete.tcl +++ b/lib/remote_branch_delete.tcl @@ -250,6 +250,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 \ @@ -258,7 +260,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 + } } } -- 2.11.4.GIT