From: Heiko Voigt Date: Mon, 15 Jun 2009 21:19:56 +0000 (+0200) Subject: git-gui: remove warning when deleting correctly merged remote branch X-Git-Tag: v1.6.6-rc0~96^2~7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2112be76508aa5d480a8cefeb634444acefcf598;p=git.git git-gui: remove warning when deleting correctly merged remote branch 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 Signed-off-by: Shawn O. Pearce --- diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl index 4e02fc0d3..31e094748 100644 --- a/lib/remote_branch_delete.tcl +++ b/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