git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Mike Ralphson" <mike.ralphson@gmail.com>
To: "Cedric Vivier" <cedricv@neonux.com>,
	"Junio C Hamano" <gitster@pobox.com>
Cc: "Git mailing list" <git@vger.kernel.org>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	mbp@sourcefrog.net
Subject: Re: [PATCH] use natural ordering to display list of branches.
Date: Fri, 6 Jun 2008 09:42:58 +0100	[thread overview]
Message-ID: <e2b179460806060142y7edc92e4y7cbad6b3cfad1eac@mail.gmail.com> (raw)
In-Reply-To: <d45085aa0806051041y42ce467fq2e07371d225ccca3@mail.gmail.com>

2008/6/5 Cedric Vivier <cedricv@neonux.com>:
>
> This small patch makes git display list of branches in natural order.
> This way, when you name your branches against, for instance, a bug number from
> some bug-tracking tool, the list will show up in a natural/human/logical order.

[Included as part of patch:]

> +
> +  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
> +  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
> +
> +  This software is provided 'as-is', without any express or implied
> +  warranty.  In no event will the authors be held liable for any damages
> +  arising from the use of this software.
> +
> +  Permission is granted to anyone to use this software for any purpose,
> +  including commercial applications, and to alter it and redistribute it
> +  freely, subject to the following restrictions:
> +
> +  1. The origin of this software must not be misrepresented; you must not
> +     claim that you wrote the original software. If you use this software
> +     in a product, an acknowledgment in the product documentation would be
> +     appreciated but is not required.
> +  2. Altered source versions must be plainly marked as such, and must not be
> +     misrepresented as being the original software.
> +  3. This notice may not be removed or altered from any source distribution.

2008/6/5 Junio C Hamano <gitster@pobox.com>:
> Perhaps, as long as we somehow mark clearly the new files added with this
> patch as "borrowed code" and not part of git proper...
>...
>
> What the big license notice comment at the top says sounded Ok to me as
> well.

IANAL, but I'm not 100% sure clauses 2a or 3 are strictly GPL
compatible (especially as "altered from" is unlikely to be interpreted
in only one way).

Perhaps we can ask the original author (cc'd) if he is prepared to
license it under GPL2?

I also think the license policy for inclusion in git should be spelt
out in the documentation, i.e. GPL (2+), GPL2 only, GPL2 compatible
etc. SubmittingPatches touches on this area, but only in terms of the
DCoO.  README merely states "Git is an Open Source project covered by
the GNU General Public License."

Some c files state GPL v2 only, others v2 with the "any later version" wording.

I had the same issue when the replacement qsort() implementations came up.

As to the patch, I like the intent, but for consistency should it not
also apply to tags?

Mike

  parent reply	other threads:[~2008-06-06  8:43 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-05 17:41 [PATCH] use natural ordering to display list of branches Cedric Vivier
2008-06-05 18:47 ` Johannes Schindelin
2008-06-05 19:29   ` Junio C Hamano
2008-06-05 19:43     ` Johannes Schindelin
2008-06-05 20:08   ` Cedric Vivier
2008-06-05 20:36     ` Marius Storm-Olsen
2008-06-06 16:46   ` Paolo Bonzini
2008-06-06 18:11     ` Johannes Schindelin
2008-06-06 18:36       ` Sverre Rabbelier
2008-06-06 19:03         ` Paolo Bonzini
2008-06-06 21:04       ` Brandon Casey
2008-06-06 21:17         ` Cedric Vivier
2008-06-06 21:23           ` Brandon Casey
2008-06-06 23:06           ` Johannes Schindelin
2008-06-06 23:11             ` Junio C Hamano
2008-06-06 23:13               ` Asheesh Laroia
2008-06-07  4:42               ` Jeff King
2008-06-07  0:13             ` Cedric Vivier
2008-06-07  0:17               ` Junio C Hamano
2008-06-07  0:43                 ` Cedric Vivier
2008-06-07  6:53                   ` Junio C Hamano
2008-06-06 21:46     ` しらいしななこ
2008-06-15 23:26   ` Ask Bjørn Hansen
2008-06-06  8:42 ` Mike Ralphson [this message]
2008-06-06  8:54   ` Cedric Vivier
2008-06-06  9:06     ` Mike Ralphson
2008-06-09  8:00     ` Andreas Ericsson

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=e2b179460806060142y7edc92e4y7cbad6b3cfad1eac@mail.gmail.com \
    --to=mike.ralphson@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=cedricv@neonux.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mbp@sourcefrog.net \
    /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).