threads / patch / 21865

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

3 messages between Dec 4, 2009 and Dec 5, 2009. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Heiko Voigt· Dec 4, 2009, 21:26 UTC · lore

We already do the same when locally deleting a branch.

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---

 lib/remote_branch_delete.tcl |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

Show changes to lib/remote_branch_delete.tcl +7 −1

diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl
index 31e0947..2416420 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
+		}
 	}
 }

-- 
1.6.4.m4.4

Jens Lehmann· Dec 5, 2009, 13:19 UTC · re: Heiko Voigt · lore

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

Heiko Voigt schrieb:

> We already do the same when locally deleting a branch.

+1

This is very useful in a workflow where the reviewer deletes the remote feature branch right after merging and pushing it.

Jens

Shawn O. Pearce· Dec 5, 2009, 21:18 UTC · re: Heiko Voigt · lore

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

Heiko Voigt <hvoigt@hvoigt.net> wrote:

Show 7 quoted lines

> We already do the same when locally deleting a branch.
> 
> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
> ---
> 
>  lib/remote_branch_delete.tcl |    8 +++++++-
>  1 files changed, 7 insertions(+), 1 deletions(-)

Thanks, applied.

-- 
Shawn.