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 1F6B2429E21 for ; Mon, 9 Jan 2012 03:16:34 -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 pXGaAh11G7E4 for ; Mon, 9 Jan 2012 03:16:30 -0800 (PST) Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id DDCDB431FB6 for ; Mon, 9 Jan 2012 03:16:29 -0800 (PST) Received: by wibhq2 with SMTP id hq2so2918422wib.26 for ; Mon, 09 Jan 2012 03:16:27 -0800 (PST) Received: by 10.180.88.10 with SMTP id bc10mr26893169wib.13.1326107787292; Mon, 09 Jan 2012 03:16:27 -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 gy6sm644552wib.11.2012.01.09.03.16.25 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 Jan 2012 03:16:26 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id 2CED99FC16; Mon, 9 Jan 2012 11:16:24 +0000 (GMT) To: David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH v2] emacs: Helpers for notmuch developers. In-Reply-To: <87mx9xw475.fsf@zancas.localnet> References: <1325685678-12710-1-git-send-email-dme@dme.org> <1325844199-1812-1-git-send-email-dme@dme.org> <87lipjk9t9.fsf@zancas.localnet> <87mx9xw475.fsf@zancas.localnet> User-Agent: Notmuch/0.10.2+151~gbf1dc2b (http://notmuchmail.org) Emacs/24.0.92.1 (x86_64-pc-linux-gnu) From: David Edmondson X-Now-Playing: Mike Morasky: Triple Laser Phase (Portal 2: Songs to Test By) Date: Mon, 09 Jan 2012 11:16:20 +0000 Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" 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: Mon, 09 Jan 2012 11:16:34 -0000 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable On Mon, 09 Jan 2012 06:38:54 -0400, David Bremner wrote: > > Oh. It's supposed to delete the existing branch. It did in my test. What > > happens for you? >=20 > FWIW, I loaded notmuch-dev.el on top of current master. >=20 > The magit buffer shows=20 >=20 > $ git --no-pager checkout -b review/patch-emacs-don't-signal-an-error-whe= n-reaching-the-end-of-the-search-results master > fatal: A branch named 'review/patch-emacs-don't-signal-an-error-when-reac= hing-the-end-of-the-search-results' already exists. >=20 > The backtrace is=20 >=20 > signal(error ("Git failed")) > error("Git failed") > magit-run*(("git" "--no-pager" "checkout" "-b" "review/patch-emacs-don'= t-signal-an-error-when-reaching-the-end-of-the-search-results" "master")) > #[nil "\303\304 B\n\"!\207" [magit-git-executable magit-git-standard-o= ptions args magit-run* append] 4]() > magit-refresh-wrapper(#[nil "\303\304 B\n\"!\207" [magit-git-executabl= e magit-git-standard-options args magit-run* append] 4]) > magit-run-git("checkout" "-b" "review/patch-emacs-don't-signal-an-error= -when-reaching-the-end-of-the-search-results" "master") > magit-create-branch("review/patch-emacs-don't-signal-an-error-when-reac= hing-the-end-of-the-search-results" "master") > notmuch-dev-create-branch("review/patch-emacs-don't-signal-an-error-whe= n-reaching-the-end-of-the-search-results") > (let ((default-directory notmuch-dev-temporary-repository-path)) (notmu= ch-dev-checkout-master) (condition-case nil (notmuch-dev-delete-branch patc= h-name) (error nil)) (notmuch-dev-create-branch patch-name) (with-temp-file= mbox-path (erase-buffer) (call-process notmuch-command nil t nil "show" "-= -format=3Dmbox" search-terms)) (magit-run* (list magit-git-executable "am" = mbox-path)) (magit-status notmuch-dev-temporary-repository-path)) > (let ((patch-name ...) (mbox-path ...)) (notmuch-dev-make-temporary-rep= ository) (let (...) (notmuch-dev-checkout-master) (condition-case nil ... .= ..) (notmuch-dev-create-branch patch-name) (with-temp-file mbox-path ... ..= .) (magit-run* ...) (magit-status notmuch-dev-temporary-repository-path))) > notmuch-dev-review-patch("[PATCH] emacs: Don't signal an error when rea= ching the end of the search results." "id:\"1324370714-28545-1-git-send-ema= il-dme@dme.org\"") > notmuch-dev-show-review-patch() > call-interactively(notmuch-dev-show-review-patch t nil) > execute-extended-command(nil) > call-interactively(execute-extended-command nil nil) Could you try running (notmuch-dev-delete-branch "review/patch-emacs-don't-signal-an-error-= when-reaching-the-end-of-the-search-results") when inside that repository please? --=-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAk8KzIQACgkQaezQq/BJZRb4wwCfS+HmJ+Qj9HrlyeHqmnEi8g2/ uFkAni9RRgs8ZXjOp8oIFPQiwEZbhwXi =L0eE -----END PGP SIGNATURE----- --=-=-=--