* [PATCH RESEND] git gui: make current branch default in "remote delete branch" merge check
@ 2009-09-20 9:47 Heiko Voigt
0 siblings, 0 replies; 4+ messages in thread
From: Heiko Voigt @ 2009-09-20 9:47 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
git-gui/lib/remote_branch_delete.tcl | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH RESEND] git gui: make current branch default in "remote delete branch" merge check
@ 2009-12-04 21:26 Heiko Voigt
2009-12-05 13:19 ` Jens Lehmann
2009-12-05 21:18 ` Shawn O. Pearce
0 siblings, 2 replies; 4+ messages in thread
From: Heiko Voigt @ 2009-12-04 21:26 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git, Jens Lehmann, Junio C Hamano
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(-)
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-12-05 21:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-20 9:47 [PATCH RESEND] git gui: make current branch default in "remote delete branch" merge check Heiko Voigt
-- strict thread matches above, loose matches on Subject: below --
2009-12-04 21:26 Heiko Voigt
2009-12-05 13:19 ` Jens Lehmann
2009-12-05 21:18 ` Shawn O. Pearce
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).