git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
	"Linus Torvalds" <torvalds@linux-foundation.org>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Mauro Carvalho Chehab" <mchehab@s-opensource.com>,
	"Han-Wen Nienhuys" <hanwen@google.com>,
	"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git
Date: Sat,  2 Oct 2021 11:19:15 +0200	[thread overview]
Message-ID: <cover-0.5-00000000000-20211002T091212Z-avarab@gmail.com> (raw)

There's patches to git.git to add a BSD-licensed reftable/ directory
with its own "COPYING" file[1]. I think that for such a thing to be
in-tree we should have some note in the top-level "COPYING" explaining
git's license, but that subdirectories or other files could be under
their own licenses.

This series reaches the end-state of pretty much stealing linux.git's
"COPYING" file, including specific wording they have. linux.git used
to have pretty much git.git's "COPYING" file (as git.git's was derived
from an older version), but has since diverged.

In linux.git there's a reference to
"Documentation/process/license-rules.rst", this new COPYING file
covers the relevant parts inline, but like linux.git's the end-state
is that the GPLv2 is not inline in the "COPYING" file anymore, instead
it's split into a GPL-2.0" and referenced by it.

The "meaty" part of this series (which I've CC'd Linus, Greg & Mauro,
who were involved in the linux.git changes) is 3-5/5. The first two
patches are just dealing with the implementation detail that git.git's
"COPYING" file happened to be used by its test suite as test data, it
couldn't be changed significantly without changing those (mostly "git
diffdiff") tests.

1. https://lore.kernel.org/git/xmqqtui4k1j5.fsf@gitster.g/

Ævar Arnfjörð Bjarmason (5):
  "lib-diff" tests: make "README" and "COPYING" test data smaller
  tests: stop using top-level "README" and "COPYING" files
  COPYING: remove mention of GPLv3, clarify sub-project COPYING
  COPYING: move GPL text to a "GPL-2.0" file
  GPL-2.0: update to byte-for-byte match the FSF's version

 COPYING                           | 377 ++----------------------------
 t/lib-diff/COPYING => GPL-2.0     |  60 ++---
 t/.gitattributes                  |   1 -
 t/lib-diff-data.sh                |  22 ++
 t/lib-diff.sh                     |   2 +
 t/lib-diff/README                 |  46 ----
 t/t4003-diff-rename-1.sh          |   4 +-
 t/t4005-diff-rename-2.sh          |   4 +-
 t/t4007-rename-3.sh               |   5 +-
 t/t4008-diff-break-rewrite.sh     |   4 +-
 t/t4009-diff-rename-4.sh          |   4 +-
 t/t4022-diff-rewrite.sh           |   6 +-
 t/t4023-diff-rename-typechange.sh |  11 +-
 t/t7001-mv.sh                     |   5 +-
 t/t7101-reset-empty-subdirs.sh    |  11 +-
 15 files changed, 89 insertions(+), 473 deletions(-)
 rename t/lib-diff/COPYING => GPL-2.0 (92%)
 create mode 100644 t/lib-diff-data.sh
 delete mode 100644 t/lib-diff/README

-- 
2.33.0.1380.g193143c62ce


             reply	other threads:[~2021-10-02  9:19 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-02  9:19 Ævar Arnfjörð Bjarmason [this message]
2021-10-02  9:19 ` [PATCH 1/5] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-04 16:46   ` Han-Wen Nienhuys
2021-10-04 17:59     ` Ævar Arnfjörð Bjarmason
2021-10-02  9:19 ` [PATCH 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-02  9:19 ` [PATCH 3/5] COPYING: remove mention of GPLv3, clarify sub-project COPYING Ævar Arnfjörð Bjarmason
2021-10-04  6:21   ` Junio C Hamano
2021-10-02  9:19 ` [PATCH 4/5] COPYING: move GPL text to a "GPL-2.0" file Ævar Arnfjörð Bjarmason
2021-10-02  9:19 ` [PATCH 5/5] GPL-2.0: update to byte-for-byte match the FSF's version Ævar Arnfjörð Bjarmason
2021-10-04 17:28 ` [PATCH 0/5] COPYING: modernize, steal boilerplate from linux.git Han-Wen Nienhuys
2021-10-05 17:01 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2021-10-05 17:01   ` [PATCH v2 1/5] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-05 17:01   ` [PATCH v2 2/5] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason
2021-10-05 17:01   ` [PATCH v2 3/5] COPYING: remove mention of GPLv3, clarify sub-project COPYING Ævar Arnfjörð Bjarmason
2021-10-05 17:01   ` [PATCH v2 4/5] COPYING: move GPL text to a "GPL-2.0" file Ævar Arnfjörð Bjarmason
2021-10-05 17:01   ` [PATCH v2 5/5] GPL-2.0: update to byte-for-byte match the FSF's version Ævar Arnfjörð Bjarmason
2021-10-15  9:30   ` [PATCH v3 0/2] tests: stop relying on top-level COPYING and README Ævar Arnfjörð Bjarmason
2021-10-15  9:30     ` [PATCH v3 1/2] "lib-diff" tests: make "README" and "COPYING" test data smaller Ævar Arnfjörð Bjarmason
2021-10-15 16:36       ` Junio C Hamano
2021-10-15  9:30     ` [PATCH v3 2/2] tests: stop using top-level "README" and "COPYING" files Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover-0.5-00000000000-20211002T091212Z-avarab@gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=hanwen@google.com \
    --cc=mchehab@s-opensource.com \
    --cc=peff@peff.net \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).