Re: Github?
authorW. Trevor King <wking@tremily.us>
Fri, 9 May 2014 03:01:56 +0000 (20:01 +1700)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 18:02:27 +0000 (10:02 -0800)
06/130192e46503128e887ebca63ef743dc8a546d [new file with mode: 0644]

diff --git a/06/130192e46503128e887ebca63ef743dc8a546d b/06/130192e46503128e887ebca63ef743dc8a546d
new file mode 100644 (file)
index 0000000..5e4b0d4
--- /dev/null
@@ -0,0 +1,144 @@
+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 8228C431FBF\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 20:02:06 -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 Q9gbLYmY70qg for <notmuch@notmuchmail.org>;\r
+       Thu,  8 May 2014 20:02:00 -0700 (PDT)\r
+Received: from qmta08.westchester.pa.mail.comcast.net\r
+       (qmta08.westchester.pa.mail.comcast.net [76.96.62.80])\r
+       by olra.theworths.org (Postfix) with ESMTP id 48DC3431FAE\r
+       for <notmuch@notmuchmail.org>; Thu,  8 May 2014 20:02:00 -0700 (PDT)\r
+Received: from omta10.westchester.pa.mail.comcast.net ([76.96.62.28])\r
+       by qmta08.westchester.pa.mail.comcast.net with comcast\r
+       id zeVp1n0040cZkys58f1zb6; Fri, 09 May 2014 03:01:59 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta10.westchester.pa.mail.comcast.net with comcast\r
+       id zf1x1n00B152l3L3Wf1ztZ; Fri, 09 May 2014 03:01:59 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 6FD42119498B; Thu,  8 May 2014 20:01:56 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1399604516; bh=QGjC6Q0Ro7l/WyfjuC247UyUDc0DuZ0iLQeQ4e/KASM=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=E2PO4z2UL8GgNBaj+Pt2GLIqV7XpNjP6WEBVvcUDP/4c+Vt08/rx6u0dMRvMDY5cu\r
+       VAg83ta8MFsgg8jc5uTeg29FexVNqJNDkxfNFA2sOtKMXibjYYRB5GKAmiHfX96/Dz\r
+       ELHVR34NuPeIamO+DSqt0Ap18pvFIlRKS4MEw18k=\r
+Date: Thu, 8 May 2014 20:01:56 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: Felipe Contreras <felipe.contreras@gmail.com>\r
+Subject: Re: Github?\r
+Message-ID: <20140509030156.GY28634@odin.tremily.us>\r
+References:\r
+ <CA+kKtKAw=nEn2dfcvF6++gD5ng+S3T8SLAdVL=Hs=EsvwUg6aw@mail.gmail.com>\r
+       <87iopgkaiz.fsf@nikula.org> <E1WiJsj-0004mz-VK@teckel.deptj.eu>\r
+       <20140508101325.GC23124@vilya.m0g.net>\r
+       <CA+kKtKA8Q5z6Pys9RAumLTiJvmGwWYKGXDkKr9Mh_6ecV-7sdA@mail.gmail.com>\r
+       <874n0zvqrx.fsf@maritornes.cs.unb.ca>\r
+       <CA+kKtKBSP0RYRy6GgEWcqTsAm_CzkN7zJfkjfwAgq8HqoyU+WQ@mail.gmail.com>\r
+       <20140508234945.GW28634@odin.tremily.us>\r
+       <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="U6ZV60npyt4sCA+1"\r
+Content-Disposition: inline\r
+In-Reply-To: <536c40b5e5333_741a161d310e2@nysa.notmuch>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1399604519;\r
+       bh=cl97eVs5ZSnEMFsLKH1CpxtN6r4nzw8phQktKiSFt6g=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=JFJooPSZHe8JEVzCNwEl6eJnb8H7zw+QB1sihItO8EXmas5zuWUkvHbyYxzuhdrh/\r
+       AO36yS30xbS6fwekYu+eE6jkNBRwAaj58LQ7g9LPRNQU/7ATUVw0u6iLdtKeIwWjJu\r
+       BLBWU1+PvyWwguvnCfBPFLC2+XgZjoNCZnJ8vf5yg/JHsgxXR0eIYgE3UGOpyM+/Dc\r
+       EN3zczNyoPVv8msZiXmgITr4TXVe8GiEJvulO/S5TJ8HVS8Pi6c8i2xjR3/+GU6H7w\r
+       bpKbiKYXnDc9vVTxoYeclFRDjN3AsROUSrJctC9wgJXCQwawVcBK7LiMHGhzvfDtZf\r
+       oKcZ2Y9fHLYJg==\r
+Cc: 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: Fri, 09 May 2014 03:02:06 -0000\r
+\r
+\r
+--U6ZV60npyt4sCA+1\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Thu, May 08, 2014 at 09:43:01PM -0500, Felipe Contreras wrote:\r
+> W. Trevor King wrote:\r
+> > I don't think merge conflicts are the problem here.  If the GitHub\r
+> > mirror claims to be a mirror but adds an additional commit B=E2=80=A6\r
+>=20\r
+> That wouldn't be a problem if HEAD didn't point to 'master' but to\r
+> 'upstream' which would be 'notmuch/master'.\r
+>=20\r
+> Or if the branch with the modifications was called something else,\r
+> like 'travis-ci'.\r
+\r
+Agreed.  The only problem I'd have is that you'd want to say that the\r
+GitHub repo was a mirror, since the primary repo would still be\r
+git://notmuchmail.org/git/notmuch.  If it's a mirror, I think it\r
+should mirror all refs on the main repo [1] without adding new ones.\r
+I'm happy for 'travis-ci' branches and whatnot in repositories that\r
+don't claim to mirror the notmuchmail.org repo.  I'm also happy to\r
+have the Travis config upstream (in any branch), in which case it\r
+would show up in the mirror.  I just don't think it's a good idea to\r
+have tweaks on a =E2=80=9Cmirror=E2=80=9D that aren't upstream, even if it =\r
+doesn't\r
+effect any upstream refs.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+[1]: in the style of 'git clone --mirror =E2=80=A6'\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
+--U6ZV60npyt4sCA+1\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
+iQIcBAEBAgAGBQJTbEUiAAoJEKKfehoaNkbtZrYQALQySZqAb+BP3IJ7TkA4VQSI\r
+0PG27LGljpGAstM9YMebTQq0unTwfBFdwbIdiDnEZpQ6v4Gk2r3y6au2aLwh27FK\r
+w+hDJsB4F392IJmcIZ16OACTj2ZDwpF/fzOje0YFKeqNhm38aq0Zyrc36yeDbrHR\r
+Hts2/mEhX6tWoIdtI/rVVKCzeQ9nwlUAzkIjoWg0wLDFWIyv4dyCzr+S2/fmqjAM\r
+xjKBxeFumDhT7AvVcqNSufmq/VdjfBroDRQnzaUTZlI9s8xmUmfCjSZrR2IFArVM\r
+TSTKPjioAkiqlEr5KFvNq+KzROPNUmtWulrM/qhvkb+LsiBKjrL+ukGWZAT4KhO9\r
+RNjsF4noO/QaWfd7YcboILLX1iNtLR4tOYU/Uzzq+2PE7ho7QQmSGJ5M/+JCqKtw\r
+YD9EbNMa4dZaHVZQa6DruOBQYSXbif48hC2uYCdfJgxiiIQxvFo84Ugip3S0Xy6j\r
+AtdRNYyvKt1PsYrS+Iqdbv4PcshKBcCVqeXaY9QRgOXC/QDb5TcaLYR19Gz7vXoZ\r
+1SwS59BCScnwCGBg85+6sFA7K6E4e2+BA8xWf+PT3A5zAG5NE6tLf2/fMHq/MbpE\r
+c9HJq/7kQscw5t+3O2amhYaIGSWu6fPyQE/fpxyYMVpcxk2fpbr99oFFxpUecChE\r
+PgAn05uFrczNSW4VS0YH\r
+=m39h\r
+-----END PGP SIGNATURE-----\r
+\r
+--U6ZV60npyt4sCA+1--\r