{"thread":{"id":"19819","subject":"[PATCH] git gui: remove warning when deleting correctly merged remote branch","startedAt":"2009-06-15T21:19:56Z","lastAt":"2009-08-10T15:47:21Z","messageCount":2,"participants":["Heiko Voigt","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"116354","messageId":"20090615211956.GB8065@macbook.lan","threadId":"19819","inReplyTo":null,"subject":"[PATCH] git gui: remove warning when deleting correctly merged remote branch","fromName":"Heiko Voigt","fromEmail":"hvoigt@hvoigt.net","sentAt":"2009-06-15T21:19:56Z","receivedAt":"2009-06-15T21:19:56Z","isPatch":true,"sender":{"key":"hvoigt@hvoigt.net","avatar":"https://avatars.githubusercontent.com/u/184958?v=4"},"body":"If the user wants to delete a remote branch and selects the correct\n\"merged into\" we should not warn that \"Recovering deleted branches is\ndifficult\". For local branches we do the same already.\n\nSigned-off-by: Heiko Voigt <hvoigt@hvoigt.net>\n---\n git-gui/lib/remote_branch_delete.tcl |   16 +++++++++-------\n 1 files changed, 9 insertions(+), 7 deletions(-)\n\ndiff --git a/git-gui/lib/remote_branch_delete.tcl b/git-gui/lib/remote_branch_delete.tcl\nindex 4e02fc0..31e0947 100644\n--- a/git-gui/lib/remote_branch_delete.tcl\n+++ b/git-gui/lib/remote_branch_delete.tcl\n@@ -208,13 +208,15 @@ method _delete {} {\n \t\treturn\n \t}\n \n-\tif {[tk_messageBox \\\n-\t\t-icon warning \\\n-\t\t-type yesno \\\n-\t\t-title [wm title $w] \\\n-\t\t-parent $w \\\n-\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n-\t\treturn\n+\tif {$checktype ne {head}} {\n+\t\tif {[tk_messageBox \\\n+\t\t\t-icon warning \\\n+\t\t\t-type yesno \\\n+\t\t\t-title [wm title $w] \\\n+\t\t\t-parent $w \\\n+\t\t\t-message [mc \"Recovering deleted branches is difficult.\\n\\nDelete the selected branches?\"]] ne yes} {\n+\t\t\treturn\n+\t\t}\n \t}\n \n \tdestroy $w\n-- \n1.6.3.1.169.g33fd\n\n\n----- End forwarded message -----\n"},{"id":"120175","messageId":"20090810154720.GV1033@spearce.org","threadId":"19819","inReplyTo":"20090615211956.GB8065@macbook.lan","subject":"Re: [PATCH] git gui: remove warning when deleting correctly merged remote branch","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-08-10T15:47:21Z","receivedAt":"2009-08-10T15:47:21Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Heiko Voigt <hvoigt@hvoigt.net> wrote:\n> If the user wants to delete a remote branch and selects the correct\n> \"merged into\" we should not warn that \"Recovering deleted branches is\n> difficult\". For local branches we do the same already.\n> \n> Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>\n> ---\n>  git-gui/lib/remote_branch_delete.tcl |   16 +++++++++-------\n>  1 files changed, 9 insertions(+), 7 deletions(-)\n\nThanks, applied.\n \n-- \nShawn.\n"}]}