From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 626E2429E43 for ; Fri, 13 Jan 2012 02:25:35 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0b2q3L+KxbbG for ; Fri, 13 Jan 2012 02:25:35 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id D0281431FB6 for ; Fri, 13 Jan 2012 02:25:34 -0800 (PST) Received: by wgbds11 with SMTP id ds11so2672847wgb.2 for ; Fri, 13 Jan 2012 02:25:33 -0800 (PST) Received: by 10.180.83.69 with SMTP id o5mr511669wiy.1.1326450333561; Fri, 13 Jan 2012 02:25:33 -0800 (PST) Received: from hotblack-desiato.hh.sledj.net (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25]) by mx.google.com with ESMTPS id g12sm14928115wiw.10.2012.01.13.02.25.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 02:25:32 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id A55869FC21; Fri, 13 Jan 2012 10:25:30 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH] notmuch-dev: Forcibly delete branches. Date: Fri, 13 Jan 2012 10:25:29 +0000 Message-Id: <1326450329-10108-1-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <871ur4ti9d.fsf@zancas.localnet> References: <871ur4ti9d.fsf@zancas.localnet> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jan 2012 10:25:35 -0000 `magit-delete-branch' runs "git branch -d ", which refuses to delete branches that are not fully merged. Given that we don't care and don't want to be stalled, use "git branch -D " directly. --- This should address the problems removing un-merged branches. emacs/notmuch-dev.el | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el index ac427ec..871ce3b 100644 --- a/emacs/notmuch-dev.el +++ b/emacs/notmuch-dev.el @@ -64,7 +64,9 @@ (magit-checkout "master")) (defun notmuch-dev-delete-branch (name) - (magit-delete-branch name)) + ;; `magit-delete-branch' uses "-d", which is not sufficiently + ;; aggressive for us. + (magit-run-git "branch" "-D" name)) (defun notmuch-dev-create-branch (name) ;; Switches to the new branch automatically. -- 1.7.7.3