* [PATCH] git gui: remove warning when deleting correctly merged remote branch
@ 2009-06-15 21:19 Heiko Voigt
2009-08-10 15:47 ` Shawn O. Pearce
0 siblings, 1 reply; 2+ messages in thread
From: Heiko Voigt @ 2009-06-15 21:19 UTC (permalink / raw)
To: git; +Cc: Shawn O. Pearce
If the user wants to delete a remote branch and selects the correct
"merged into" we should not warn that "Recovering deleted branches is
difficult". For local branches we do the same already.
Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
---
git-gui/lib/remote_branch_delete.tcl | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl
index 4e02fc0..31e0947 100644
--- a/git-gui/lib/remote_branch_delete.tcl
+++ b/git-gui/lib/remote_branch_delete.tcl
@@ -208,13 +208,15 @@ method _delete {} {
return
}
- if {[tk_messageBox \
- -icon warning \
- -type yesno \
- -title [wm title $w] \
- -parent $w \
- -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
- return
+ if {$checktype ne {head}} {
+ if {[tk_messageBox \
+ -icon warning \
+ -type yesno \
+ -title [wm title $w] \
+ -parent $w \
+ -message [mc "Recovering deleted branches is difficult.\n\nDelete the selected branches?"]] ne yes} {
+ return
+ }
}
destroy $w
--
1.6.3.1.169.g33fd
----- End forwarded message -----
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-10 15:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-15 21:19 [PATCH] git gui: remove warning when deleting correctly merged remote branch Heiko Voigt
2009-08-10 15:47 ` 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).