1 Return-Path: <dme@dme.org>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 626E2429E43
\r
6 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 02:25:35 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id 0b2q3L+KxbbG for <notmuch@notmuchmail.org>;
\r
16 Fri, 13 Jan 2012 02:25:35 -0800 (PST)
\r
17 Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com
\r
18 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
19 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
20 D0281431FB6 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 02:25:34 -0800
\r
22 Received: by wgbds11 with SMTP id ds11so2672847wgb.2
\r
23 for <notmuch@notmuchmail.org>; Fri, 13 Jan 2012 02:25:33 -0800 (PST)
\r
24 Received: by 10.180.83.69 with SMTP id o5mr511669wiy.1.1326450333561;
\r
25 Fri, 13 Jan 2012 02:25:33 -0800 (PST)
\r
26 Received: from hotblack-desiato.hh.sledj.net
\r
27 (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])
\r
28 by mx.google.com with ESMTPS id g12sm14928115wiw.10.2012.01.13.02.25.31
\r
29 (version=TLSv1/SSLv3 cipher=OTHER);
\r
30 Fri, 13 Jan 2012 02:25:32 -0800 (PST)
\r
31 Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)
\r
32 id A55869FC21; Fri, 13 Jan 2012 10:25:30 +0000 (GMT)
\r
33 From: David Edmondson <dme@dme.org>
\r
34 To: notmuch@notmuchmail.org
\r
35 Subject: [PATCH] notmuch-dev: Forcibly delete branches.
\r
36 Date: Fri, 13 Jan 2012 10:25:29 +0000
\r
37 Message-Id: <1326450329-10108-1-git-send-email-dme@dme.org>
\r
38 X-Mailer: git-send-email 1.7.7.3
\r
39 In-Reply-To: <871ur4ti9d.fsf@zancas.localnet>
\r
40 References: <871ur4ti9d.fsf@zancas.localnet>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Fri, 13 Jan 2012 10:25:35 -0000
\r
55 `magit-delete-branch' runs "git branch -d <branch>", which refuses to
\r
56 delete branches that are not fully merged. Given that we don't care
\r
57 and don't want to be stalled, use "git branch -D <branch>" directly.
\r
60 This should address the problems removing un-merged branches.
\r
62 emacs/notmuch-dev.el | 4 +++-
\r
63 1 files changed, 3 insertions(+), 1 deletions(-)
\r
65 diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el
\r
66 index ac427ec..871ce3b 100644
\r
67 --- a/emacs/notmuch-dev.el
\r
68 +++ b/emacs/notmuch-dev.el
\r
70 (magit-checkout "master"))
\r
72 (defun notmuch-dev-delete-branch (name)
\r
73 - (magit-delete-branch name))
\r
74 + ;; `magit-delete-branch' uses "-d", which is not sufficiently
\r
75 + ;; aggressive for us.
\r
76 + (magit-run-git "branch" "-D" name))
\r
78 (defun notmuch-dev-create-branch (name)
\r
79 ;; Switches to the new branch automatically.
\r