unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Edmondson <dme@dme.org>
To: notmuch@notmuchmail.org
Subject: [PATCH] notmuch-dev: Forcibly delete branches.
Date: Fri, 13 Jan 2012 10:25:29 +0000	[thread overview]
Message-ID: <1326450329-10108-1-git-send-email-dme@dme.org> (raw)
In-Reply-To: <871ur4ti9d.fsf@zancas.localnet>

`magit-delete-branch' runs "git branch -d <branch>", 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 <branch>" 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

  reply	other threads:[~2012-01-13 10:25 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-04 14:01 [PATCH] emacs: Helpers for notmuch developers David Edmondson
2012-01-06  3:39 ` David Bremner
2012-01-06  8:27   ` David Edmondson
2012-01-06 10:03 ` [PATCH v2] " David Edmondson
2012-01-07 11:53   ` David Bremner
2012-01-09  8:23     ` David Edmondson
2012-01-09 10:38       ` David Bremner
2012-01-09 11:16         ` David Edmondson
2012-01-13  3:04           ` David Bremner
2012-01-13 10:25             ` David Edmondson [this message]
2012-01-13 12:25               ` [PATCH] notmuch-dev: Forcibly delete branches David Bremner
2012-01-13 13:28                 ` [PATCH 1/2] notmuch-dev: Remove more characters from branch names David Edmondson
2012-01-13 13:28                   ` [PATCH 2/2] notmuch-dev: Update the master branch when requested David Edmondson
2012-01-13 21:03                     ` Xavier Maillard
2012-01-16  9:07                       ` David Edmondson
2012-01-16 21:19                         ` Xavier Maillard
2012-01-06 22:56 ` [PATCH] emacs: Helpers for notmuch developers Tomi Ollila
2012-01-09  8:27   ` David Edmondson

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

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1326450329-10108-1-git-send-email-dme@dme.org \
    --to=dme@dme.org \
    --cc=notmuch@notmuchmail.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.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

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 read-only IMAP folder(s) and NNTP newsgroup(s).