threads / patch / 21005

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

Subject: [PATCH RESEND] git gui: make current branch default in "remote delete branch" merge check

## tl;dr

One message between Sep 20, 2009 and Sep 20, 2009. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Heiko Voigt· Sep 20, 2009, 09:47 UTC · lore
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
 git-gui/lib/remote_branch_delete.tcl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
Show changes to git-gui/lib/remote_branch_delete.tcl +7 −1
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
index 4e02fc0..9b119a7 100644
--- a/git-gui/lib/remote_branch_delete.tcl
+++ b/git-gui/lib/remote_branch_delete.tcl
@@ -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
+		}
 	}
 }
 
-- 
1.6.5.rc1.10.g20f34

← back to recent threads