Skip to content

Commit

Permalink
git-gui: remove warning when deleting correctly merged remote branch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiko Voigt authored and Shawn O. Pearce committed Aug 10, 2009
1 parent 2ee94d1 commit 2112be7
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions lib/remote_branch_delete.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2112be7

Please sign in to comment.