From: "Karl Hasselström" <kha@treskal.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: git@vger.kernel.org, "Aneesh Kumar" <aneesh.kumar@gmail.com>,
"Karl Hasselström" <kha@treskal.com>
Subject: [StGit PATCH 2/4] Don't try to delete the branch twice
Date: Sat, 22 Sep 2007 10:46:25 +0200 [thread overview]
Message-ID: <20070922084625.29884.63499.stgit@yoghurt> (raw)
In-Reply-To: <20070922084334.29884.60506.stgit@yoghurt>
We already delete it in Stack.delete(), so don't do it here too.
Signed-off-by: Karl Hasselström <kha@treskal.com>
---
stgit/commands/branch.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/stgit/commands/branch.py b/stgit/commands/branch.py
index 8c99936..c16fc69 100644
--- a/stgit/commands/branch.py
+++ b/stgit/commands/branch.py
@@ -99,7 +99,6 @@ def __delete_branch(doomed_name, force = False):
raise CmdException('Cannot delete the current branch')
doomed.delete(force)
- git.delete_branch(doomed_name)
out.done()
next prev parent reply other threads:[~2007-09-22 8:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-21 4:40 stg branch --delete doesn't work Aneesh Kumar
2007-09-21 9:48 ` Karl Hasselström
2007-09-22 8:46 ` [StGit PATCH 0/4] Fix "stg branch --delete" Karl Hasselström
2007-09-22 8:46 ` [StGit PATCH 1/4] Don't special-case the "master" branch during branch delete Karl Hasselström
2007-09-22 8:46 ` Karl Hasselström [this message]
2007-09-22 8:46 ` [StGit PATCH 3/4] Properly remove all config for a deleted branch Karl Hasselström
2007-09-22 8:46 ` [StGit PATCH 4/4] Add simple test for "stg branch --delete" Karl Hasselström
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=20070922084625.29884.63499.stgit@yoghurt \
--to=kha@treskal.com \
--cc=aneesh.kumar@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.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).