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

hvoigt · spearce · commit c0d153295c6f · 2009-12-05T13:17:51.000-08:00
We already do the same when locally deleting a branch.

Signed-off-by: Heiko Voigt &lt;hvoigt@hvoigt.net&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git 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
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,8 @@ method _write_url {args} { set urltype url }`
`250`	`250`	`method _write_check_head {args} { set checktype head }`
`251`	`251`
`252`	`252`	`method _write_head_list {args} {`
	`253`	`+ global current_branch`
	`254`	`+`
`253`	`255`	`$head_m delete 0 end`
`254`	`256`	`foreach abr $head_list {`
`255`	`257`	`$head_m insert end radiobutton \`
`@@ -258,7 +260,11 @@ method _write_head_list {args} {`
`258`	`260`	`-variable @check_head`
`259`	`261`	`}`
`260`	`262`	`if {[lsearch -exact -sorted $head_list $check_head] < 0} {`
`261`		`- set check_head {}`
	`263`	`+ if {[lsearch -exact -sorted $head_list $current_branch] < 0} {`
	`264`	`+ set check_head {}`
	`265`	`+ } else {`
	`266`	`+ set check_head $current_branch`
	`267`	`+ }`
`262`	`268`	`}`
`263`	`269`	`}`
`264`	`270`