Re: [PATCH 1/2] Add Google Inc. to AUTHORS as a contributor.

diff --git a/3f/921d355879722b4447e86dc286a1a9395d6f60 b/3f/921d355879722b4447e86dc286a1a9395d6f60
new file mode 100644 (file)
index 0000000..0d3104e
--- /dev/null
+++ b/3f/921d355879722b4447e86dc286a1a9395d6f60
@@ -0,0 +1,84 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 9B8306DE00CC\r
+ for <notmuch@notmuchmail.org>; Fri, 22 Jul 2016 06:01:20 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.011\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.011 tagged_above=-999 required=5 tests=[AWL=0.000,\r
+  SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id WYJJnfZtm2NQ for <notmuch@notmuchmail.org>;\r
+ Fri, 22 Jul 2016 06:01:12 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id A1CD46DE00BF\r
+ for <notmuch@notmuchmail.org>; Fri, 22 Jul 2016 06:01:12 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1bQa56-00054L-73; Fri, 22 Jul 2016 09:01:32 -0400\r
+Received: (nullmailer pid 8422 invoked by uid 1000);\r
+ Fri, 22 Jul 2016 13:01:08 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Matt Armstrong <marmstrong@google.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] Add Google Inc. to AUTHORS as a contributor.\r
+In-Reply-To: <1469136633-19235-2-git-send-email-marmstrong@google.com>\r
+References: <1469136633-19235-1-git-send-email-marmstrong@google.com>\r
+ <1469136633-19235-2-git-send-email-marmstrong@google.com>\r
+User-Agent: Notmuch/0.22.1 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Fri, 22 Jul 2016 10:01:08 -0300\r
+Message-ID: <877fcdltd7.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 22 Jul 2016 13:01:20 -0000\r
+\r
+Matt Armstrong <marmstrong@google.com> writes:\r
+\r
+> By virtue of being a Google employee I'm required to contribute\r
+> software in the name of Google and not myself.  Google retains\r
+> whatever rights (and liabilities) that come from having done so, not\r
+> myself.  As long as this is clear, and my association with Google is\r
+> clear, my employer is quite supportive of my making these\r
+> contributions.\r
+\r
+I've no objection to this in principle, but\r
+\r
+1) if we start updating AUTHORS after 7 years of neglect, I think we\r
+need to do a more systematic job. I'm tempted to script the output of\r
+"git shortlog" as part of the release process.\r
+\r
+In id:1469191654-5922-1-git-send-email-david@tethera.net, I've posted\r
+the beginnings of a mailmap file. What about adding something like\r
+\r
+Google Inc. (by way of Matt Armstrong)  <marmstrong@google.com>\r
+\r
+to the mailmap file?\r
+\r
+If that sounds reasonable to you, I'll leave it to you to play with the\r
+mailmap syntax to get what you want.\r
+\r
+\r
+2) If you think the corporate overlords are fine with a mention of\r
+contribution in AUTHORS, that's also fine for me, but note that this is\r
+distinct from a claim of copyright.  There are copyright headers in\r
+every source file, so if you want to claim copyright on behalf of your\r
+employer (which is fine, I think we're not fussed about people adding\r
+themselves to copyright headers for anything more than 2 lines of change\r
+or so) then you'll want to update those headers. At least, that would be\r
+that safer option, rather than thinking such a claim is implicit.\r