Re: Git global usage and tests

From: Jeff King <peff@peff.net>
Date: May 31, 2011, 15:04 UTC
Message-ID: <20110531150455.GA2594@sigill.intra.peff.net>
In-Reply-To: <BANLkTinW_se8VAhF9wk3KyzNHVc_wH_PqA@mail.gmail.com>

On Tue, May 31, 2011 at 01:52:31PM +0200, Ævar Arnfjörð Bjarmason wrote:

Show 5 quoted lines

> > IIRC, libgit2 has a lot looser license than ours, and the core GPLv2 part
> > of C git cannot be directly copied without authors' consent; relicensing
> > of necessary parts of C git needs to be arranged.
> 
> Seems like a PITA:

Some of the permission has already been granted. There is a file in libgit2 documenting who has done so. The set difference is:

  $ git log --format=%an parse-options.[ch] | sort -u >need
  $ perl -lne 'print $1 if /^ok\s+(.*) </' libgit2/git.git-authors >have
  $ comm -23 need have >remaining; cat remaining
  Alex Riesen
  Andreas Schwab
  Carlos Rica
  Gary V. Vaughan
  Giuseppe Scrivano
  Jake Goulding
  Jonathan Nieder
  Mark Lodato
  Michael J Gruber
  Michele Ballabio
  Mike Ralphson
  Miklos Vajna
  Nanako Shiraishi
  Olivier Marin
  Stephen Boyd
  Thomas Rast
  Tuncer Ayaz

which gets us halfway there. A few of the remaining contributions are quite small, too:

  $ git blame --line-porcelain parse-options.c |
      perl -lne 'print $1 if /author (.*)/' |
      sort | uniq -c |
      perl -pe 's/(\d+) /$1\t/' >count
  $ join -1 1 -2 2 -t "`printf '\t'`" -o "2.1 2.2" remaining count
      4 Alex Riesen
      3 Andreas Schwab
     23 Giuseppe Scrivano
     16 Jake Goulding
     38 Jonathan Nieder
     16 Mark Lodato
      7 Michele Ballabio
      1 Nanako Shiraishi
      1 Olivier Marin
     46 Stephen Boyd
     24 Thomas Rast
     22 Tuncer Ayaz

Fixing a typo or tweaking the "static" designator on a function is probably not copyrightable. And some of the medium-sized bits could possibly be dropped. Still, it is nice to be mindful of the contributions of others and get permission from everyone.

At any rate, the parse-options code would be linked into the new git2 binary, which should probably be GPL'd, anyway.

-Peff