diff options
| author | Heiko Voigt <hvoigt@hvoigt.net> | 2009-06-15 23:19:56 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-08-10 08:47:34 -0700 |
| commit | 2112be76508aa5d480a8cefeb634444acefcf598 (patch) | |
| tree | 100808e6b7487c54b186084a6a88e342282dbd8b | |
| parent | 2ee94d141eb86c1e43453664eea7a45b37dbf72f (diff) | |
| download | git-2112be76508aa5d480a8cefeb634444acefcf598.tar.gz git-2112be76508aa5d480a8cefeb634444acefcf598.tar.xz | |
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>
| -rw-r--r-- | lib/remote_branch_delete.tcl | 16 |
1 files changed, 9 insertions, 7 deletions
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 |