From: Mark Levedahl <mdl123@verizon.net>
To: Paul Mackerras <paulus@samba.org>
Cc: Git Mailing List <git@vger.kernel.org>,
Mark Levedahl <mdl123@verizon.net>
Subject: [PATCH] gitk - dont warn when deleting synonym for current head
Date: Sun, 12 Aug 2007 17:03:03 -0400 [thread overview]
Message-ID: <1186952583887-git-send-email-mdl123@verizon.net> (raw)
Selecting "remove this branch" on a branch equal to HEAD yielded a
warning that this branch is not in any other: it is, it is on HEAD.
Curiosly, this warning was not triggered for any other deletion and
so is at best misleading. Get rid of it.
Signed-off-by: Mark Levedahl <mdl123@verizon.net>
---
gitk | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/gitk b/gitk
index 769c79a..055cdc7 100755
--- a/gitk
+++ b/gitk
@@ -6171,12 +6171,6 @@ proc rmbranch {} {
error_popup "Cannot delete the currently checked-out branch"
return
}
- set dheads [descheads $id]
- if {$dheads eq $headids($head)} {
- # the stuff on this branch isn't on any other branch
- if {![confirm_popup "The commits on branch $head aren't on any other\
- branch.\nReally delete branch $head?"]} return
- }
nowbusy rmbranch
update
if {[catch {exec git branch -D $head} err]} {
--
1.5.3.rc4.80.ge600
next reply other threads:[~2007-08-12 21:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-12 21:03 Mark Levedahl [this message]
2007-08-12 23:44 ` [PATCH] gitk - dont warn when deleting synonym for current head Paul Mackerras
2007-08-13 1:10 ` Mark Levedahl
2007-08-13 1:51 ` Mark Levedahl
2007-08-13 3:52 ` Paul Mackerras
2007-08-13 13:04 ` Mark Levedahl
2007-08-13 13:22 ` Mark Levedahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1186952583887-git-send-email-mdl123@verizon.net \
--to=mdl123@verizon.net \
--cc=git@vger.kernel.org \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).