Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 1BBC5431FBC for ; Sun, 6 Apr 2014 05:29:31 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 tomDDjM9e0tA for ; Sun, 6 Apr 2014 05:29:23 -0700 (PDT) Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net [87.98.215.224]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id E37DD431FB6 for ; Sun, 6 Apr 2014 05:29:22 -0700 (PDT) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.72) (envelope-from ) id 1WWmBQ-0003W8-KP; Sun, 06 Apr 2014 12:28:20 +0000 Received: (nullmailer pid 17199 invoked by uid 1000); Sun, 06 Apr 2014 12:27:59 -0000 From: David Bremner To: "W. Trevor King" , notmuch Subject: Re: [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream} In-Reply-To: References: User-Agent: Notmuch/0.17+170~gf516b7c (http://notmuchmail.org) Emacs/24.3.1 (x86_64-pc-linux-gnu) Date: Sun, 06 Apr 2014 09:27:59 -0300 Message-ID: <87d2gu4p80.fsf@maritornes.cs.unb.ca> MIME-Version: 1.0 Content-Type: text/plain 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: Sun, 06 Apr 2014 12:29:31 -0000 "W. Trevor King" writes: > With two branches getting fetched (master and config), the branch > referenced by FETCH_HEAD is ambiguous. For example, I have: > > $ cat FETCH_HEAD > 41d7bfa7184cc93c9dac139d1674e9530799e3b0 \ > not-for-merge branch 'config' of http://nmbug.tethera.net/git/nmbug-tags > acd379ccb973c45713eee9db177efc530f921954 \ > not-for-merge branch 'master' of http://nmbug.tethera.net/git/nmbug-tags This patch seems OK. I think it makes sense to have an "nmbug clone" command; perhaps the implementation can be simplified in the future (or perhaps not). d