From: Karl Hasselström Date: Sat, 22 Sep 2007 07:58:24 +0000 (+0200) Subject: Don't try to delete the branch twice X-Git-Tag: v0.14.3~117 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/bdea385bce305482d3c3b8ab7fb019e7acf4a521?ds=sidebyside;hp=57059512207410968f8e796454b03ffdf118ef4e Don't try to delete the branch twice We already delete it in Stack.delete(), so don't do it here too. Signed-off-by: Karl Hasselström --- 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()