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 <hvoigt@hvoigt.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Heiko Voigt 2009-06-15 23:19:56 +02:00 committed by Shawn O. Pearce
parent 2ee94d141e
commit 2112be7650
1 changed files with 9 additions and 7 deletions

View File

@ -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