--- /dev/null
+Return-Path: <marmstrong@google.com>\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 605F86DE00E6\r
+ for <notmuch@notmuchmail.org>; Mon, 1 Aug 2016 08:47:04 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.022\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.022 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.211, SPF_PASS=-0.001,\r
+ 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 0e00VOiJ_CMZ for <notmuch@notmuchmail.org>;\r
+ Mon, 1 Aug 2016 08:46:54 -0700 (PDT)\r
+Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com\r
+ [209.85.220.44])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 7FCE46DE00B8\r
+ for <notmuch@notmuchmail.org>; Mon, 1 Aug 2016 08:46:54 -0700 (PDT)\r
+Received: by mail-pa0-f44.google.com with SMTP id fi15so54068611pac.1\r
+ for <notmuch@notmuchmail.org>; Mon, 01 Aug 2016 08:46:54 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;\r
+ s=20120113;\r
+ h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+ :mime-version; bh=vRaNE+s0nRHSfAhkIejb34PyDXz1tO3eM2hdtbLfgdQ=;\r
+ b=fh8gIvr78pK3J1ZebP3g1Z1krs5wyXqgGblMcPdEyNnxqPEJnea8pv27ZkxkmNnH6B\r
+ BEWbaDvKP7mhhVCl+rt2VZwl3odHQHQtVJCTDhJRcEk3xsUG0OM7UVLN7nj3SDTeiSDO\r
+ Hpwgj/ZP3qdfz0CG32lMKqUPyyFwI6k0ktJSbUX6qMboirPwPRoME7QpX59lolayC16Q\r
+ 5ELbIsPVdcWcHx73lygoyAeGTv56VnH8/1kbIUxq+AoqVvRR4n9QnyNTux9oorsLQiQl\r
+ YGZqH1kfOXUuFaoNExVqs9jX8DMIeb0ZuuZVVFt4SIdoJteDjirAoKyYgywUi+zHNTaV yf0w==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:in-reply-to:references\r
+ :user-agent:date:message-id:mime-version;\r
+ bh=vRaNE+s0nRHSfAhkIejb34PyDXz1tO3eM2hdtbLfgdQ=;\r
+ b=l9GJtAmRGG7eCKMW+HoBkmM/8TYb3wnal8muDWPUgKaCF6p+JHA/bMSL/BAbeWeCgM\r
+ AQ1ePuirqYipSu+z9LBvC2JmgJfwzsfdb1/J7ds9U9BA9tzAdSQwnar5Pun8t8GO4MOg\r
+ BdJEYM0Fdy/ew1L7H+GRBXj8yylvcHICREoQEzmQl+MXoZxKKjb+JlcRjBIzvGmKL7YG\r
+ 73WAb4qt7HIblUwcLGao/7J3ZggSiBLY8w6dpClDGSUjfKOUIwLfNOkcWzzLDWunMCae\r
+ VzpkiZWESiL2/gt2DOci2YeyL5qmTRoqs9Dc/Rblyb4PtmXhN++4cXLL/9148u+hmiFR\r
+ sz0Q==\r
+X-Gm-Message-State:\r
+ AEkoousjwjjVBpQLPKrbp2o2djw5RCYfQ3EewRidcoSR8XEeQ474bQMWsw3iraBxSNndQgTl\r
+X-Received: by 10.66.197.195 with SMTP id iw3mr96499586pac.82.1470066411318;\r
+ Mon, 01 Aug 2016 08:46:51 -0700 (PDT)\r
+Received: from marmstrong-linux.kir.corp.google.com\r
+ ([2620:0:1008:1101:d44a:4bf2:9882:a156])\r
+ by smtp.gmail.com with ESMTPSA id dz13sm46604005pac.44.2016.08.01.08.46.49\r
+ (version=TLS1_2 cipher=AES128-SHA bits=128/128);\r
+ Mon, 01 Aug 2016 08:46:50 -0700 (PDT)\r
+From: Matt Armstrong <marmstrong@google.com>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] Add Google Inc. to AUTHORS as a contributor.\r
+In-Reply-To: <877fcdltd7.fsf@zancas.localnet>\r
+References: <1469136633-19235-1-git-send-email-marmstrong@google.com>\r
+ <1469136633-19235-2-git-send-email-marmstrong@google.com>\r
+ <877fcdltd7.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.21 (https://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Mon, 01 Aug 2016 08:46:49 -0700\r
+Message-ID: <qf5twf4mqza.fsf@marmstrong-linux.kir.corp.google.com>\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: Mon, 01 Aug 2016 15:47:04 -0000\r
+\r
+David Bremner <david@tethera.net> writes:\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.\r
+\r
+[...]\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.\r
+\r
+Looking into this further, if AUTHORS file is essentially unmaintained,\r
+I need not touch it.\r
+\r
+\r
+> I'm tempted to script the output of "git shortlog" as part of the\r
+> 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
+I think the @google.com in my email address is enough. I don't need to\r
+tweak my display name to mention "Google Inc." via .mailcap.\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
+\r
+Thanks for thinking about this David.\r
+\r
+The good news: in looking into this further, the issue of leaving (c)\r
+claims in code is secondary. The primary thing I'm supposed to do is\r
+send patches with my work email.\r
+\r
+If I become a significant author in some file, adding a (c) Google makes\r
+sense if that the normal thing to do in notmuch. I'll keep that in\r
+mind.\r
+\r
+Google's open source lawyers tell me that regardless of what (c) marks\r
+appear in code, the author of code (e.g. significant patches) retains\r
+copyright unless other arrangements are made, such as those you see in\r
+FSF projects (https://www.gnu.org/licenses/why-assign.en.html). When it\r
+comes to a real legal investigation things like the git commit log come\r
+into play. A "(c) Google Inc." is nice to have, especially if a project\r
+typically maintains them with some rigor, but it isn't required or\r
+particularly significant.\r