summaryrefslogtreecommitdiff
path: root/git-gui/lib/remote_branch_delete.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-10-27 21:55:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-10-27 21:55:37 (GMT)
commit4096958aab6f83302dd00f19d2bd500ae75e8c29 (patch)
treec231a97c24ca3b7653fa0542bcfe90f141f1d1e9 /git-gui/lib/remote_branch_delete.tcl
parent610f99ec7d22b5750f12350f67c1341d6be8030f (diff)
parentacb9108c19e40b0477b8c828d1c5054665abbaf4 (diff)
downloadgit-4096958aab6f83302dd00f19d2bd500ae75e8c29.zip
git-4096958aab6f83302dd00f19d2bd500ae75e8c29.tar.gz
git-4096958aab6f83302dd00f19d2bd500ae75e8c29.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: adjust the minimum height of diff pane for shorter screen height git-gui: fix use of uninitialized variable git-gui: store wm state and fix wm geometry git-gui: Ensure submodule path is quoted properly git-gui: fix diff for partially staged submodule changes git-gui: Update russian translation git-gui: Limit display to a maximum number of files git-gui: remove warning when deleting correctly merged remote branch git-gui: Added Greek translation & glossary git-gui: display summary when showing diff of a submodule
Diffstat (limited to 'git-gui/lib/remote_branch_delete.tcl')
-rw-r--r--git-gui/lib/remote_branch_delete.tcl16
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