From 5a00bb7b4d4ac9a533111665d02b64f535ba1367 Mon Sep 17 00:00:00 2001 From: Will Norris Date: Wed, 13 Jul 2016 11:31:26 -0600 Subject: [PATCH] remove CONTRIBUTORS file Google no longer recommends CONTRIBUTORS files for projects, since this data is better retrieved directly from version control. Additionally, contributors are now instructed to add themselves (or their employer, if appropriate) to the AUTHORS file, rather than the maintainers being responsible for trying to keep this file up to date. Ultimately, this should result in more accurate data, since in most cases we don't know whether the code is copyright the contributor or their employer. --- AUTHORS | 10 ++++- CONTRIBUTING.md | 18 ++++---- CONTRIBUTORS | 108 ------------------------------------------------ 3 files changed, 15 insertions(+), 121 deletions(-) delete mode 100644 CONTRIBUTORS diff --git a/AUTHORS b/AUTHORS index 8e17817..20ccd08 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,12 @@ # This is the official list of go-github authors for copyright purposes. -# This file is distinct from the CONTRIBUTORS files. -# See the latter for an explanation. +# +# This does not necessarily list everyone who has contributed code, since in +# some cases, their employer may be the copyright holder. To see the full list +# of contributors, see the revision history in source control or +# https://github.com/google/go-github/graphs/contributors. +# +# Authors who wish to be recognized in this file should add themselves (or +# their employer, as appropriate). Ainsley Chong Akeda Bagus diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 27c4548..a0fbcf7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,9 +78,13 @@ defined at live in (These notes are mostly only for people merging in pull requests.) -**First and foremost, try to maintain a clean, linear git history.** With very -few exceptions, running `git log` should not show a bunch of branching and -merging. +**Verify CLAs.** CLAs must be on file for the pull request submitter and commit +author(s). Google's CLA verification system should handle this automatically +and will set commit statuses as appropriate. If there's ever any question about +a pull request, ask [willnorris](https://github.com/willnorris). + +**Always try to maintain a clean, linear git history.** With very few +exceptions, running `git log` should not show a bunch of branching and merging. Never use the GitHub "merge" button, since it always creates a merge commit. Instead, check out the pull request locally ([these git aliases @@ -100,14 +104,6 @@ you can also leave a comment on the pull request [like this][rebase-comment]. If you made any other changes, it's worth noting that as well, [like this][modified-comment]. -If this is the first pull request from a new contributor, make sure they've -signed a CLA and then add them to the AUTHORS and CONTRIBUTORS file. If they -are contributing on behalf of a company, the individual goes in CONTRIBUTORS and -the company goes in AUTHORS. Contributors should never add themselves to these -files. If they try to, don't merge that commit. These files should only ever -be modified by project maintainers so that the git history of these files -identifies who actually did the CLA verification. - [git-aliases]: https://github.com/willnorris/dotfiles/blob/d640d010c23b1116bdb3d4dc12088ed26120d87d/git/.gitconfig#L13-L15 [rebase-comment]: https://github.com/google/go-github/pull/277#issuecomment-183035491 [modified-comment]: https://github.com/google/go-github/pull/280#issuecomment-184859046 diff --git a/CONTRIBUTORS b/CONTRIBUTORS deleted file mode 100644 index f7a316e..0000000 --- a/CONTRIBUTORS +++ /dev/null @@ -1,108 +0,0 @@ -# People who have agreed to one of the CLAs and can contribute patches. -# The AUTHORS file lists the copyright holders; this file -# lists people. For example, Google employees are listed here -# but not in AUTHORS, because Google holds the copyright. -# -# https://developers.google.com/open-source/cla/individual -# https://developers.google.com/open-source/cla/corporate -# -# Note that the CLA isn't a copyright _assigment_ but rather a -# copyright _license_. You retain the copyright on your -# contributions. - -Ainsley Chong -Akeda Bagus -Alec Thomas -Alex Bramley -Alexander Harkness -Ali Afshar -Amey Sakhadeo -Andreas Garnæs -Andrew Ryabchun -Arıl Bozoluk -Austin Dizzy -Beshr Kayali -Beyang Liu -Billy Lynch -Björn Häuser -Brad Harris -Brendan Burns -Brian Egizi -Cami Diez -Carlos Alexandro Becker -Charlie Yan -Chris Broadfoot -Chris Roche -Chris Schaefer -Colin Misare -Craig Peterson -Cristian Maglie -Daniel Leavitt -David Deng -Diego Lapiduz -Dmitri Shuralyov -dmnlk -Doug Turner -Eric Paris -erwinvaneyk -Filippo Valsorda -Francis -Fredrik Jönsson -Garrett Squire -Georgy Buranov -Glenn Lewis -griffin_stewie -Guz Alexander -Hanno Hecker -Hari haran -i2bskn -Isao Jonas -Jameel Haffejee -Jason Hall -Jihoon Chung -Joe Tsai -John Engelman -Julien Rostand -Justin Abrahms -Konrad Malawski -Krzysztof Kowalczyk -Kyle Kelley -kyokomi -Luke Evers -Luke Roberts -Maksim Zhylinski -Mark McDonald -Martin-Louis Bright -Mat Geist -Matt Landis -Maxime Bury -Michael Tiller -Nathan VanBenschoten -Neil O'Toole -Omar Jarjur -Ondrej Kupka -Panagiotis Moustafellos -Parker Moore -Pierre Carrier -Piotr Zurek -Quinn Slack -Rob Figueiredo -Russ Cox -Ruben Vereecken -Ryan Lower -saisi -Sander van Harmelen -Sean Wang -Shawn Smith -sona-tar -Stian Eikeland -Thomas Bruyelle -Tobias Schmidt -Trey Tacon -Victor Castell -Will Norris -William Bailey -Yann Malet -Yannick Utard -Yicheng Qin -Zach Latta