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 9110A414395 for ; Fri, 13 Jan 2012 05:28:22 -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 5hrdxIYpJOOh for ; Fri, 13 Jan 2012 05:28:22 -0800 (PST) Received: from mail-we0-f181.google.com (mail-we0-f181.google.com [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 0CD24414393 for ; Fri, 13 Jan 2012 05:28:21 -0800 (PST) Received: by werm13 with SMTP id m13so436286wer.26 for ; Fri, 13 Jan 2012 05:28:20 -0800 (PST) Received: by 10.216.133.142 with SMTP id q14mr393630wei.57.1326461300670; Fri, 13 Jan 2012 05:28:20 -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 f19sm11074250wbo.13.2012.01.13.05.28.18 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 Jan 2012 05:28:19 -0800 (PST) Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000) id A90F4A0CED; Fri, 13 Jan 2012 13:28:17 +0000 (GMT) From: David Edmondson To: notmuch@notmuchmail.org Subject: [PATCH 2/2] notmuch-dev: Update the master branch when requested. Date: Fri, 13 Jan 2012 13:28:14 +0000 Message-Id: <1326461294-25546-2-git-send-email-dme@dme.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1326461294-25546-1-git-send-email-dme@dme.org> References: <87wr8v23ib.fsf@zancas.localnet> <1326461294-25546-1-git-send-email-dme@dme.org> 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 13:28:22 -0000 If `notmuch-dev-show-review-patch' is called with a prefix argument, pull updates for the 'master' branch of the temporary repository. --- emacs/notmuch-dev.el | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/emacs/notmuch-dev.el b/emacs/notmuch-dev.el index 465846f..3a15bf4 100644 --- a/emacs/notmuch-dev.el +++ b/emacs/notmuch-dev.el @@ -61,7 +61,12 @@ (error "git clone failed.")))) (defun notmuch-dev-checkout-master () - (magit-checkout "master")) + (magit-checkout "master") + (when current-prefix-arg + (message "Updating master...") + ;; Don't use `magit-pull' because it runs asynchronously. + (magit-run-git "pull" "-v") + (message "Updating master...done."))) (defun notmuch-dev-delete-branch (name) ;; `magit-delete-branch' uses "-d", which is not sufficiently @@ -108,6 +113,7 @@ (let ((default-directory notmuch-dev-temporary-repository-path)) (notmuch-dev-checkout-master) + ;; Delete the branch if it exists. (condition-case nil (notmuch-dev-delete-branch patch-name) -- 1.7.7.3