--- /dev/null
+Return-Path: <wking@tremily.us>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 1574A431FBD\r
+ for <notmuch@notmuchmail.org>; Wed, 9 Apr 2014 19:06:14 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id rwp64mdalp8L for <notmuch@notmuchmail.org>;\r
+ Wed, 9 Apr 2014 19:06:06 -0700 (PDT)\r
+Received: from qmta05.westchester.pa.mail.comcast.net\r
+ (qmta05.westchester.pa.mail.comcast.net [76.96.62.48])\r
+ by olra.theworths.org (Postfix) with ESMTP id 2A6B6431FBC\r
+ for <notmuch@notmuchmail.org>; Wed, 9 Apr 2014 19:06:06 -0700 (PDT)\r
+Received: from omta08.westchester.pa.mail.comcast.net ([76.96.62.12])\r
+ by qmta05.westchester.pa.mail.comcast.net with comcast\r
+ id o1lD1n0050Fqzac55262eh; Thu, 10 Apr 2014 02:06:02 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+ by omta08.westchester.pa.mail.comcast.net with comcast\r
+ id o2601n008152l3L3U260Lv; Thu, 10 Apr 2014 02:06:02 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+ id D6B35114473F; Wed, 9 Apr 2014 19:05:59 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+ t=1397095559; bh=isIEokHw50Kvz0GKwS3OZ/sUql8LKjBySbRJ4dE/mBM=;\r
+ h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+ b=YMmy2C7NN+wfCB9C9eKGETikXshAZWYWU5WAAirrfccaSsSUiKOaHQhfgBXNDHHa5\r
+ PX7WTtYjI2GNod4mNhincpvT3518/FIIL5oKMdkXHfIkiO197p7scuQAa57XHvQfyV\r
+ eNB3T/yjYGqynsb3F+J2/raUItOQSIxi79NrZluI=\r
+Date: Wed, 9 Apr 2014 19:05:59 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
+ changes\r
+Message-ID: <20140410020559.GC21805@odin.tremily.us>\r
+References: <878urg849d.fsf@zancas.localnet>\r
+ <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
+ <871tx67nnx.fsf@zancas.localnet>\r
+ <20140409210108.GB21805@odin.tremily.us>\r
+ <87sipm576i.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+ protocol="application/pgp-signature"; boundary="XWOWbaMNXpFDWE00"\r
+Content-Disposition: inline\r
+In-Reply-To: <87sipm576i.fsf@zancas.localnet>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+ url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.22 (2013-10-16)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+ s=q20140121; t=1397095562;\r
+ bh=4W5T0LIZuEj4R3D/xmOZJEMCcPqJ0YBUcPfVEWnfnyc=;\r
+ h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+ MIME-Version:Content-Type;\r
+ b=kz8+y97u3cYlZrvlnJ7KEmLFUUlDSf/2jVafUdaCEdcOwY6KsSkuLSHe9ZnDm0Ei5\r
+ AkcX3WzGENYnA8uWnq2dgCN2MZdx9IriIB9xj9P4a3X8430qpql/mPPGSWrYc+vvvQ\r
+ kPqyRMd+qu3MPvJN4DuUoBYt2t26b4LTR5Rjh0o3zVSZq0Rxi//OG4GZHzeq8qnIqj\r
+ hwZnlnG4Ihwqy+BweVA7uHljubiKqLiqiuoT5gOpl3M/lAgD1TqSpYUlR8nWH+HAv9\r
+ 9YrjFtIsi+A/ccgq1tSsvgJnNIPY5r8VeUxfcR9rrWMZ5yyq+G6MpTj87fxYek9y1r\r
+ lWX8/Ukjnn11g==\r
+Cc: notmuch <notmuch@notmuchmail.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 10 Apr 2014 02:06:14 -0000\r
+\r
+\r
+--XWOWbaMNXpFDWE00\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Wed, Apr 09, 2014 at 10:01:25PM -0300, David Bremner wrote:\r
+> W. Trevor King writes:\r
+>=20\r
+> > We need non-bare repositories to have remote-tracking branches\r
+> > (distinct from local branches) [3], and we need remote-tracking\r
+> > branches to have working @{upstream}.\r
+>=20\r
+> OK, I see what you mean, the repository has "bare =3D false". On the\r
+> other hand we immediately blow away the work tree,\r
+\r
+But whenever we do anything that might involve a working directory\r
+(just merging), we create a temporary one and set GIT_WORK_TREE. So\r
+the ~/.nmbug repo is a plain-vanilla, non-bare repo with an ephemeral\r
+working directory.\r
+\r
+> > I think that's reasonable support for my claim (and most of it is in\r
+> > the original c200167 commit message), but maybe not?\r
+>=20\r
+> In any case, I think I think it's mainly a technicality, and that we\r
+> want to keep the level of detail in the release notes down a bit.\r
+> If you don't like the above mini-patch, then maybe a NOTES section\r
+> in the nmbug docs.\r
+\r
+Sure. I think my previous email was my shot at explaining the\r
+situation ;). If it wasn't clear, maybe someone else could take a\r
+stab at a NOTES blurb.\r
+\r
+> >> Is the "remote repository" in step 1 meant to be the central repo? or\r
+> >> just a backup?\r
+> >\r
+> > The backup. If you have nothing to backup, you already got everything\r
+> > back after cloning the central repo.\r
+>=20\r
+> It might be less confusing to explicitly use the word "backup" in\r
+> step 1 then.\r
+\r
+How about:\r
+\r
+ 1. If you have any purely local commits (i.e. they aren't in the\r
+ nmbug repository on nmbug.tethera.net), push them to a remote\r
+ repository. We'll restore them from the backup in step 4.\r
+\r
+?\r
+\r
+We can also use the suggested ~/.nmbug.bak from step 2 as the backup\r
+repository in step 4. I chose the current broad-sketch approach for\r
+steps 1 and 4, because I assumed folks with local commits would be\r
+comfortable pushing Git branches around, and didn't want to imply that\r
+I'd covered all the corner cases (e.g. folks with my-funky-tags\r
+branches or other wonky repos).\r
+\r
+Cheers,\r
+Trevor\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--XWOWbaMNXpFDWE00\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2.0.22 (GNU/Linux)\r
+\r
+iQIcBAEBAgAGBQJTRfyFAAoJEKKfehoaNkbtDfUQAKbOeUk+VamOoOt4BnIQWoGJ\r
+8Sz32gRPlKE2p+3VnEEsh9NADUsyzO1Iq2snVqg9eyq9KBlMciL5wStEhnzrQFdj\r
+5j+joJSlav9tkRFhVmhKvVGzRDMaVUBwD90LU13n8QUxjXnrBDOQzajVlKp6XPof\r
+yHyZOsOSisW+RoeJvAkDDJ4ykeOsLChnivFN4gkMjkqFMAs4Az0p+eGI5hA1u5A+\r
+ITdzkeD5odf4LBNE3dCsqBjosfCa+1gE5nUwxylu/AiRuAjB+t+ouMZadAYqqZuD\r
+lbLbS9upJx9+pc/W//ovr5IB5fDpCZ6qSqx7qYcSy071u5MCswv6eHDFNa38LlI+\r
+vLUqQIm6QHNtqGux55eL6w2wAG0hNCmPv4pxM4PNbb4QWYHZYyoIGu5AMxVn1haH\r
+5kXZCQhu73i7XhyDRT3mxsCCTWnNft3SheXVmeBCsyiLIcI4PBUai6vK/GSqpT2F\r
+uiOceYSFGKOsuaNK7pxY3pQQSOxMewJUzqY+6Ptmrb6lKG1azxjE1o+fGladAynz\r
+oQKMb42aVWGDVhT7jRxRg8UVIA2AE45gO/R36Jg9ctdw/j2dK9v0k2qF6rzOljr1\r
+g1IOCZZZtbVRJOh4uDg45bBN9aCfPvW1qKv7KoGEcbRPi+P2EjEkS21yEAnO04oa\r
+5CdOvb+W0dGb6Pb4uNG0\r
+=nEiu\r
+-----END PGP SIGNATURE-----\r
+\r
+--XWOWbaMNXpFDWE00--\r
projects / notmuch-archives.git / commitdiff