{"thread":{"id":"21865","subject":"[PATCH RESEND] git gui: make current branch default in \"remote delete branch\" merge check","startedAt":"2009-12-04T21:26:48Z","lastAt":"2009-12-05T21:18:51Z","messageCount":3,"participants":["Heiko Voigt","Jens Lehmann","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"129243","messageId":"20091204212648.GA3979@book.hvoigt.net","threadId":"21865","inReplyTo":null,"subject":"[PATCH RESEND] git gui: make current branch default in \"remote delete branch\" merge check","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2009-12-04T21:26:48Z","receivedAt":"2009-12-04T21:26:48Z","isPatch":true,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"We already do the same when locally deleting a branch.\n\nSigned-off-by: Heiko Voigt <hvoigt@hvoigt.net>\n---\n\n lib/remote_branch_delete.tcl |    8 +++++++-\n 1 files changed, 7 insertions(+), 1 deletions(-)\n\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex 31e0947..2416420 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -250,6 +250,8 @@ method _write_url        {args} { set urltype url    }\n method _write_check_head {args} { set checktype head }\n \n method _write_head_list {args} {\n+\tglobal current_branch\n+\n \t$head_m delete 0 end\n \tforeach abr $head_list {\n \t\t$head_m insert end radiobutton \\\n@@ -258,7 +260,11 @@ method _write_head_list {args} {\n \t\t\t-variable @check_head\n \t}\n \tif {[lsearch -exact -sorted $head_list $check_head] < 0} {\n-\t\tset check_head {}\n+\t\tif {[lsearch -exact -sorted $head_list $current_branch] < 0} {\n+\t\t\tset check_head {}\n+\t\t} else {\n+\t\t\tset check_head $current_branch\n+\t\t}\n \t}\n }\n \n-- \n1.6.4.m4.4\n"},{"id":"129267","messageId":"4B1A5DF9.70203@web.de","threadId":"21865","inReplyTo":"20091204212648.GA3979@book.hvoigt.net","subject":"Re: [PATCH RESEND] git gui: make current branch default in \"remote delete branch\" merge check","fromName":"Jens Lehmann","fromEmail":"jens.lehmann@web.de","sentAt":"2009-12-05T13:19:53Z","receivedAt":"2009-12-05T13:19:53Z","isPatch":true,"sender":{"key":"jens.lehmann@web.de","avatar":"https://avatars.githubusercontent.com/u/135220?v=4"},"body":"Heiko Voigt schrieb:\n> We already do the same when locally deleting a branch.\n\n+1\n\nThis is very useful in a workflow where the reviewer deletes the remote\nfeature branch right after merging and pushing it.\n\n\nJens\n"},{"id":"129290","messageId":"20091205211851.GD5610@spearce.org","threadId":"21865","inReplyTo":"20091204212648.GA3979@book.hvoigt.net","subject":"Re: [PATCH RESEND] git gui: make current branch default in \"remote delete branch\" merge check","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-12-05T21:18:51Z","receivedAt":"2009-12-05T21:18:51Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Heiko Voigt <hvoigt@hvoigt.net> wrote:\n> We already do the same when locally deleting a branch.\n> \n> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>\n> ---\n> \n>  lib/remote_branch_delete.tcl |    8 +++++++-\n>  1 files changed, 7 insertions(+), 1 deletions(-)\n\nThanks, applied.\n \n-- \nShawn.\n"}]}