0b/3711736700d7322d9caeb672f76c286f9701ac

   1 Return-Path: <wking@tremily.us>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 1574A431FBD\r
   6         for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 19:06:14 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.1\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         RCVD_IN_DNSWL_NONE=-0.0001] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id rwp64mdalp8L for <notmuch@notmuchmail.org>;\r
  17         Wed,  9 Apr 2014 19:06:06 -0700 (PDT)\r
  18 Received: from qmta05.westchester.pa.mail.comcast.net\r
  19         (qmta05.westchester.pa.mail.comcast.net [76.96.62.48])\r
  20         by olra.theworths.org (Postfix) with ESMTP id 2A6B6431FBC\r
  21         for <notmuch@notmuchmail.org>; Wed,  9 Apr 2014 19:06:06 -0700 (PDT)\r
  22 Received: from omta08.westchester.pa.mail.comcast.net ([76.96.62.12])\r
  23         by qmta05.westchester.pa.mail.comcast.net with comcast\r
  24         id o1lD1n0050Fqzac55262eh; Thu, 10 Apr 2014 02:06:02 +0000\r
  25 Received: from odin.tremily.us ([24.18.63.50])\r
  26         by omta08.westchester.pa.mail.comcast.net with comcast\r
  27         id o2601n008152l3L3U260Lv; Thu, 10 Apr 2014 02:06:02 +0000\r
  28 Received: by odin.tremily.us (Postfix, from userid 1000)\r
  29         id D6B35114473F; Wed,  9 Apr 2014 19:05:59 -0700 (PDT)\r
  30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
  31         t=1397095559; bh=isIEokHw50Kvz0GKwS3OZ/sUql8LKjBySbRJ4dE/mBM=;\r
  32         h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
  33         b=YMmy2C7NN+wfCB9C9eKGETikXshAZWYWU5WAAirrfccaSsSUiKOaHQhfgBXNDHHa5\r
  34         PX7WTtYjI2GNod4mNhincpvT3518/FIIL5oKMdkXHfIkiO197p7scuQAa57XHvQfyV\r
  35         eNB3T/yjYGqynsb3F+J2/raUItOQSIxi79NrZluI=\r
  36 Date: Wed, 9 Apr 2014 19:05:59 -0700\r
  37 From: "W. Trevor King" <wking@tremily.us>\r
  38 To: David Bremner <david@tethera.net>\r
  39 Subject: Re: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}\r
  40         changes\r
  41 Message-ID: <20140410020559.GC21805@odin.tremily.us>\r
  42 References: <878urg849d.fsf@zancas.localnet>\r
  43         <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>\r
  44         <871tx67nnx.fsf@zancas.localnet>\r
  45         <20140409210108.GB21805@odin.tremily.us>\r
  46         <87sipm576i.fsf@zancas.localnet>\r
  47 MIME-Version: 1.0\r
  48 Content-Type: multipart/signed; micalg=pgp-sha1;\r
  49         protocol="application/pgp-signature"; boundary="XWOWbaMNXpFDWE00"\r
  50 Content-Disposition: inline\r
  51 In-Reply-To: <87sipm576i.fsf@zancas.localnet>\r
  52 OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
  53         url=http://tremily.us/pubkey.txt\r
  54 User-Agent: Mutt/1.5.22 (2013-10-16)\r
  55 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
  56         s=q20140121; t=1397095562;\r
  57         bh=4W5T0LIZuEj4R3D/xmOZJEMCcPqJ0YBUcPfVEWnfnyc=;\r
  58         h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
  59         MIME-Version:Content-Type;\r
  60         b=kz8+y97u3cYlZrvlnJ7KEmLFUUlDSf/2jVafUdaCEdcOwY6KsSkuLSHe9ZnDm0Ei5\r
  61         AkcX3WzGENYnA8uWnq2dgCN2MZdx9IriIB9xj9P4a3X8430qpql/mPPGSWrYc+vvvQ\r
  62         kPqyRMd+qu3MPvJN4DuUoBYt2t26b4LTR5Rjh0o3zVSZq0Rxi//OG4GZHzeq8qnIqj\r
  63         hwZnlnG4Ihwqy+BweVA7uHljubiKqLiqiuoT5gOpl3M/lAgD1TqSpYUlR8nWH+HAv9\r
  64         9YrjFtIsi+A/ccgq1tSsvgJnNIPY5r8VeUxfcR9rrWMZ5yyq+G6MpTj87fxYek9y1r\r
  65         lWX8/Ukjnn11g==\r
  66 Cc: notmuch <notmuch@notmuchmail.org>\r
  67 X-BeenThere: notmuch@notmuchmail.org\r
  68 X-Mailman-Version: 2.1.13\r
  69 Precedence: list\r
  70 List-Id: "Use and development of the notmuch mail system."\r
  71         <notmuch.notmuchmail.org>\r
  72 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  73         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  74 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  75 List-Post: <mailto:notmuch@notmuchmail.org>\r
  76 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  77 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  78         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  79 X-List-Received-Date: Thu, 10 Apr 2014 02:06:14 -0000\r
  80 \r
  81 \r
  82 --XWOWbaMNXpFDWE00\r
  83 Content-Type: text/plain; charset=us-ascii\r
  84 Content-Disposition: inline\r
  85 Content-Transfer-Encoding: quoted-printable\r
  86 \r
  87 On Wed, Apr 09, 2014 at 10:01:25PM -0300, David Bremner wrote:\r
  88 > W. Trevor King writes:\r
  89 >=20\r
  90 > > We need non-bare repositories to have remote-tracking branches\r
  91 > > (distinct from local branches) [3], and we need remote-tracking\r
  92 > > branches to have working @{upstream}.\r
  93 >=20\r
  94 > OK, I see what you mean, the repository has "bare =3D false". On the\r
  95 > other hand we immediately blow away the work tree,\r
  96 \r
  97 But whenever we do anything that might involve a working directory\r
  98 (just merging), we create a temporary one and set GIT_WORK_TREE.  So\r
  99 the ~/.nmbug repo is a plain-vanilla, non-bare repo with an ephemeral\r
 100 working directory.\r
 101 \r
 102 > > I think that's reasonable support for my claim (and most of it is in\r
 103 > > the original c200167 commit message), but maybe not?\r
 104 >=20\r
 105 > In any case, I think I think it's mainly a technicality, and that we\r
 106 > want to keep the level of detail in the release notes down a bit.\r
 107 > If you don't like the above mini-patch, then maybe a NOTES section\r
 108 > in the nmbug docs.\r
 109 \r
 110 Sure.  I think my previous email was my shot at explaining the\r
 111 situation ;).  If it wasn't clear, maybe someone else could take a\r
 112 stab at a NOTES blurb.\r
 113 \r
 114 > >> Is the "remote repository" in step 1 meant to be the central repo? or\r
 115 > >> just a backup?\r
 116 > >\r
 117 > > The backup.  If you have nothing to backup, you already got everything\r
 118 > > back after cloning the central repo.\r
 119 >=20\r
 120 > It might be less confusing to explicitly use the word "backup" in\r
 121 > step 1 then.\r
 122 \r
 123 How about:\r
 124 \r
 125   1. If you have any purely local commits (i.e. they aren't in the\r
 126      nmbug repository on nmbug.tethera.net), push them to a remote\r
 127      repository.  We'll restore them from the backup in step 4.\r
 128 \r
 129 ?\r
 130 \r
 131 We can also use the suggested ~/.nmbug.bak from step 2 as the backup\r
 132 repository in step 4.  I chose the current broad-sketch approach for\r
 133 steps 1 and 4, because I assumed folks with local commits would be\r
 134 comfortable pushing Git branches around, and didn't want to imply that\r
 135 I'd covered all the corner cases (e.g. folks with my-funky-tags\r
 136 branches or other wonky repos).\r
 137 \r
 138 Cheers,\r
 139 Trevor\r
 140 \r
 141 --=20\r
 142 This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
 143 For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
 144 \r
 145 --XWOWbaMNXpFDWE00\r
 146 Content-Type: application/pgp-signature; name="signature.asc"\r
 147 Content-Description: OpenPGP digital signature\r
 148 \r
 149 -----BEGIN PGP SIGNATURE-----\r
 150 Version: GnuPG v2.0.22 (GNU/Linux)\r
 151 \r
 152 iQIcBAEBAgAGBQJTRfyFAAoJEKKfehoaNkbtDfUQAKbOeUk+VamOoOt4BnIQWoGJ\r
 153 8Sz32gRPlKE2p+3VnEEsh9NADUsyzO1Iq2snVqg9eyq9KBlMciL5wStEhnzrQFdj\r
 154 5j+joJSlav9tkRFhVmhKvVGzRDMaVUBwD90LU13n8QUxjXnrBDOQzajVlKp6XPof\r
 155 yHyZOsOSisW+RoeJvAkDDJ4ykeOsLChnivFN4gkMjkqFMAs4Az0p+eGI5hA1u5A+\r
 156 ITdzkeD5odf4LBNE3dCsqBjosfCa+1gE5nUwxylu/AiRuAjB+t+ouMZadAYqqZuD\r
 157 lbLbS9upJx9+pc/W//ovr5IB5fDpCZ6qSqx7qYcSy071u5MCswv6eHDFNa38LlI+\r
 158 vLUqQIm6QHNtqGux55eL6w2wAG0hNCmPv4pxM4PNbb4QWYHZYyoIGu5AMxVn1haH\r
 159 5kXZCQhu73i7XhyDRT3mxsCCTWnNft3SheXVmeBCsyiLIcI4PBUai6vK/GSqpT2F\r
 160 uiOceYSFGKOsuaNK7pxY3pQQSOxMewJUzqY+6Ptmrb6lKG1azxjE1o+fGladAynz\r
 161 oQKMb42aVWGDVhT7jRxRg8UVIA2AE45gO/R36Jg9ctdw/j2dK9v0k2qF6rzOljr1\r
 162 g1IOCZZZtbVRJOh4uDg45bBN9aCfPvW1qKv7KoGEcbRPi+P2EjEkS21yEAnO04oa\r
 163 5CdOvb+W0dGb6Pb4uNG0\r
 164 =nEiu\r
 165 -----END PGP SIGNATURE-----\r
 166 \r
 167 --XWOWbaMNXpFDWE00--\r