Re: [RFC/PATCH] Git doc: GPL2 does not apply to repo data

2016-01-31 Thread Matthieu Moy
- Original Message - > For less tech-savvy managers, I found that name dropping works quite well > (read: naming a couple of well-known companies/products that switched to > Git). In the same category: "GitHub has 12 millions users" works rather well. -- Matthieu Moy http://www-verimag.i

RE: [RFC/PATCH] Git doc: GPL2 does not apply to repo data

2016-01-31 Thread Johannes Schindelin
Hi Jonathan, On Sun, 31 Jan 2016, Jonathan Smith wrote: > I'll be taking all of your contributions as ammo as I continue to fight > for Git here. I would hope that it is unnecessary to point weapons at managers to "convince" them to use Git. In the meantime, I think we have accumulated a lot of

Re: [PATCH] t6302: drop unnecessary GPG requirement

2016-01-31 Thread Johannes Schindelin
Hi Eric & Junio, On Sun, 31 Jan 2016, Junio C Hamano wrote: > Eric Sunshine writes: > > > These tests are concerned specifically with filtering, sorting, > > formatting behavior of git-for-each-ref, yet if GPG is not present, > > the entire test script is skipped even though none of the tests d

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Johannes Schindelin
Hi Aaron, On Sun, 31 Jan 2016, Torsten Bögershausen wrote: > On 2016-01-31 15.03, Aaron Gray wrote: > > > > I think I have found a possible difference in behaviour between > > Windows git commandline distro and Linux git > > > > basically If I do a :- > > > > git mv logger.h Logger.h > >

Re: [PATCH v3 6/6] worktree add: switch to worktree version 1

2016-01-31 Thread Duy Nguyen
On Mon, Feb 1, 2016 at 12:33 PM, Max Kirillov wrote: > On Tue, Jan 26, 2016 at 06:44:45PM +0700, Nguyễn Thái Ngọc Duy wrote: >> + for (key_p = per_wortree_keys; *key_p; key_p++) { >> + const char *key = *key_p; >> + char *value = get_key(sb.buf,

Re: [PATCH v3 6/6] worktree add: switch to worktree version 1

2016-01-31 Thread Max Kirillov
On Tue, Jan 26, 2016 at 06:44:45PM +0700, Nguyễn Thái Ngọc Duy wrote: > + for (key_p = per_wortree_keys; *key_p; key_p++) { > + const char *key = *key_p; > + char *value = get_key(sb.buf, key); > + > + if (value) { > +

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-01-31 Thread Duy Nguyen
On Mon, Feb 1, 2016 at 9:41 AM, Stefan Monnier wrote: >> One lessor key phrase above is "so far", I think, and another one >> you forgot to use is s/which requires/that we know &/, which to me >> is a more serious one. IOW, I do think it is premature for us to >> say that that config split issue

Re: [PATCH v3 5/6] config: select .git/common/config with --repo

2016-01-31 Thread Duy Nguyen
On Sun, Jan 31, 2016 at 5:10 AM, Max Kirillov wrote: > On Tue, Jan 26, 2016 at 06:44:44PM +0700, Nguyễn Thái Ngọc Duy wrote: >> This new option allows the user to write to or read from >> .git/common/config in worktree v1. In worktree v0, --repo is an alias >> of --local. > > Looks like by default

Re: [PATCH v3 4/6] worktree: new config file hierarchy

2016-01-31 Thread Duy Nguyen
On Fri, Jan 29, 2016 at 1:45 AM, Junio C Hamano wrote: > Would it make it simpler to invent a specific value for 'xxx' that > denotes the main worktree (hence $C/worktrees/xxx/config will always > be read by worktrees including the primary one), not to add > $C/common/ anything, and use $C/config

Re: [PATCH 4/6] checkout-index: handle "--no-index" option

2016-01-31 Thread Jeff King
On Sun, Jan 31, 2016 at 06:25:22PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > I also reformatted the comment that violated our style > > guidelines, but I am not sure if it is all that helpful. It > > seems we also cancel "--index" with "--temp" or > > "--stage=all", but I do not kno

Re: [PATCH 5/6] checkout-index: disallow "--no-stage" option

2016-01-31 Thread Jeff King
On Sun, Jan 31, 2016 at 06:18:39PM -0800, Junio C Hamano wrote: > > builtin/checkout-index.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c > > index f8179a7..7a9b561 100644 > > --- a/builtin/checkout-index.c >

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-01-31 Thread Stefan Monnier
> As a heavy user of the git-new-worktree "hack / script", is there git-new-workdir Sorry, Stefan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mor

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-01-31 Thread Stefan Monnier
> One lessor key phrase above is "so far", I think, and another one > you forgot to use is s/which requires/that we know &/, which to me > is a more serious one. IOW, I do think it is premature for us to > say that that config split issue is the only thing, or to say that > the issue is best solve

Re: [PATCH 4/6] checkout-index: handle "--no-index" option

2016-01-31 Thread Junio C Hamano
Jeff King writes: > I also reformatted the comment that violated our style > guidelines, but I am not sure if it is all that helpful. It > seems we also cancel "--index" with "--temp" or > "--stage=all", but I do not know why. I left the content > as-is, but if somebody knows enough to elaborate,

Re: [PATCH 5/6] checkout-index: disallow "--no-stage" option

2016-01-31 Thread Junio C Hamano
Jeff King writes: > We do not really expect people to use "--no-stage", but if > they do, git currently segfaults. We could instead have it > undo the effects of a previous "--stage", but this gets > tricky around the "to_tempfile" flag. We cannot simply reset > it to 0, because we don't know if

Re: [PATCH 0/6] post-strbuf_getline cleanups

2016-01-31 Thread Junio C Hamano
Jeff King writes: > As promised, here are the "how about this on top" patches that came out > of the discussion for the "strbuf_getline" series in: > > > http://thread.gmane.org/gmane.comp.version-control.msysgit/21773/focus=284001 Thanks for following up. > As I looked further at some of th

Re: [PATCH] t6302: drop unnecessary GPG requirement

2016-01-31 Thread Junio C Hamano
Eric Sunshine writes: > These tests are concerned specifically with filtering, sorting, > formatting behavior of git-for-each-ref, yet if GPG is not present, the > entire test script is skipped even though none of the tests depend upon > or care whether the tags are signed. This unnecessary depen

RE: [RFC/PATCH] Git doc: GPL2 does not apply to repo data

2016-01-31 Thread Jonathan Smith
Hi all I would like to thank you each for being so helpful with my request. As a humble developer trying to penetrate the corporate environment with leading technologies such as Git, it's awesome to know you guys are so proactive with providing support. I'll be taking all of your contributions

Re: [RFC/PATCH] Git doc: GPL2 does not apply to repo data

2016-01-31 Thread Junio C Hamano
Philip Oakley writes: > diff --git a/Documentation/git.txt b/Documentation/git.txt > index bff6302..137c89c 100644 > --- a/Documentation/git.txt > +++ b/Documentation/git.txt > @@ -1132,6 +1132,17 @@ of clones and fetches. > - any external helpers are named by their protocol (e.g., use >

Re: [RFC/PATCH 0/5] [WAS: Submodule Groups] Labels and submodule.autoInitialize

2016-01-31 Thread Jens Lehmann
Am 26.01.2016 um 22:50 schrieb Stefan Beller: On Tue, Jan 26, 2016 at 12:59 PM, Jens Lehmann wrote: Ok. Though we might wanna call it submodule.autoUpdate, as initializing it is only the prerequisite for automatically updating submodules. And I believe automatically updating is the thing we're

[RFC/PATCH] Git doc: GPL2 does not apply to repo data

2016-01-31 Thread Philip Oakley
Some potential commercial users may be put off by the FUD (Fear, Uncertainty and Doubt) that has been raised in the past regarding the use of FOSS software. In such communities, even the legal advice may be misinformed and over-cautious regarding the storage of code and other intellectual property

Re: GPL v2 authoritative answer on stored code as a derived work

2016-01-31 Thread Philip Oakley
From: "Johannes Schindelin" Sent: Thursday, January 28, 2016 8:16 AM Hi Philip, On Wed, 27 Jan 2016, Philip Oakley wrote: From: "Junio C Hamano" > Jonathan Smith writes: > > > It's pretty clear that code stored in a Git repository isn't > > considered a derived work of Git, regardless of wh

[PATCH] t6302: drop unnecessary GPG requirement

2016-01-31 Thread Eric Sunshine
These tests are concerned specifically with filtering, sorting, formatting behavior of git-for-each-ref, yet if GPG is not present, the entire test script is skipped even though none of the tests depend upon or care whether the tags are signed. This unnecessary dependency upon GPG may prevent these

[PATCH v4 11/12] ref-filter: introduce contents_atom_parser()

2016-01-31 Thread Karthik Nayak
Introduce contents_atom_parser() which will parse the '%(contents)' atom and store information into the 'used_atom' structure based on the modifiers used along with the atom. Also introduce body_atom_parser() and subject_atom_parser() for parsing atoms '%(body)' and '%(subject)' respectively. Help

[PATCH v4 12/12] ref-filter: introduce objectname_atom_parser()

2016-01-31 Thread Karthik Nayak
Introduce objectname_atom_parser() which will parse the '%(objectname)' atom and store information into the 'used_atom' structure based on the modifiers used along with the atom. Helped-by: Ramsay Jones Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 35 +++

[PATCH v4 05/12] ref-filter: introduce parsing functions for each valid atom

2016-01-31 Thread Karthik Nayak
Parsing atoms is done in populate_value(), this is repetitive and hence expensive. Introduce a parsing function which would let us parse atoms beforehand and store the required details into the 'used_atom' structure for further usage. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- re

[PATCH v4 03/12] ref-filter: bump 'used_atom' and related code to the top

2016-01-31 Thread Karthik Nayak
Bump code to the top for usage in further patches. --- ref-filter.c | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ref-filter.c b/ref-filter.c index 38f38d4..c3a8372 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -16,6 +16,21 @@ typedef enu

[PATCH v4 02/12] ref-filter: use strbuf_split_str_omit_term()

2016-01-31 Thread Karthik Nayak
Use the newly introduced strbuf_split_str_omit_term() rather than using strbuf_split_str() and manually removing the ',' terminator. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ref-filter.c b/

[PATCH v4 00/12] ref-filter: use parsing functions

2016-01-31 Thread Karthik Nayak
This series cleans up populate_value() in ref-filter, by moving out the parsing part of atoms to separate parsing functions. This ensures that parsing is only done once and also improves the modularity of the code. v1: http://thread.gmane.org/gmane.comp.version-control.git/281180 v2: http://thread

[PATCH v4 01/12] strbuf: introduce strbuf_split_str_omit_term()

2016-01-31 Thread Karthik Nayak
The current implementation of 'strbuf_split_buf()' includes the terminator at the end of each strbuf post splitting. Add an option wherein we can drop the terminator if desired. In this context introduce a wrapper function 'strbuf_split_str_omit_term()' which splits a given string into strbufs with

[PATCH v4 04/12] ref-filter: introduce struct used_atom

2016-01-31 Thread Karthik Nayak
Introduce the 'used_atom' structure to replace the existing implementation of 'used_atom' (which is a list of atoms). This helps us parse atoms beforehand and store required details into the 'used_atom' for future usage. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 3

[PATCH v4 08/12] ref-filter: introduce align_atom_parser()

2016-01-31 Thread Karthik Nayak
Introduce align_atom_parser() which will parse an 'align' atom and store the required alignment position and width in the 'used_atom' structure for further usage in populate_value(). Since this patch removes the last usage of match_atom_name(), remove the function from ref-filter.c. Helped-by: Er

[PATCH v4 06/12] ref-filter: introduce color_atom_parser()

2016-01-31 Thread Karthik Nayak
Introduce color_atom_parser() which will parse a "color" atom and store its color in the "used_atom" structure for further usage in populate_value(). Helped-by: Ramsay Jones Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c | 25 - 1 file changed, 1

[PATCH v4 07/12] ref-filter: introduce parse_align_position()

2016-01-31 Thread Karthik Nayak
>From populate_value() extract parse_align_position() which given a string would give us the alignment position. This is a preparatory patch as to introduce prefixes for the %(align) atom and avoid redundancy in the code. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- ref-filter.c |

[PATCH v4 09/12] ref-filter: align: introduce long-form syntax

2016-01-31 Thread Karthik Nayak
Introduce optional prefixes "width=" and "position=" for the align atom so that the atom can be used as "%(align:width=,position=)". Add Documentation and tests for the same. Helped-by: Eric Sunshine Signed-off-by: Karthik Nayak --- Documentation/git-for-each-ref.txt | 20 ++ r

Re: Replacing strbuf_getline_lf() by strbuf_getline() in wt-status.c

2016-01-31 Thread Junio C Hamano
Moritz Neeb writes: > Currently I am working on replacing strbuf_getline_lf() by > strbuf_getline() in places where the input is trimmed immediately after > reading, cf. $gmane/284104, "Notes on the remaining strbuf_getline_lf() > callers", 2nd point. > > One instance I found was in wt-status.c.

Re: [PATCH v3 1/6] worktree: new repo extension to manage worktree behaviors

2016-01-31 Thread Junio C Hamano
Max Kirillov writes: > The worktree feature has been used by several people > already (me included), and do far the only issue which > requires change in repository layout is the config > separation. Isn't it enough to be confident? One lessor key phrase above is "so far", I think, and another o

Re: [PATCH 2/1] support -4 and -6 switches for remote operations

2016-01-31 Thread Torsten Bögershausen
On 2016-01-31 01.01, Eric Wong wrote: > Torsten Bögershausen wrote: >> On 2016-01-30 14.13, Eric Wong wrote: >>> The ssh(1) command has an equivalent switches which we may >>> pass when we run them. > >> Should we mention that putty and tortoiseplink don't have these options ? >> At least in the

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Torsten Bögershausen
On 2016-01-31 15.03, Aaron Gray wrote: > Hi, > > I think I have found a possible difference in behaviour between > Windows git commandline distro and Linux git > > basically If I do a :- > > git mv logger.h Logger.h > > I get the following :- > > fatal: destination exists, source=lib/l

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Aaron Gray
On 31 January 2016 at 14:50, Johannes Sixt wrote: > Am 31.01.2016 um 15:03 schrieb Aaron Gray: >> >> Hi, >> >> I think I have found a possible difference in behaviour between >> Windows git commandline distro and Linux git >> >> basically If I do a :- >> >> git mv logger.h Logger.h >> >> I ge

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Aaron Gray
On 31 January 2016 at 15:05, Doug Kelly wrote: > On Sun, Jan 31, 2016 at 8:50 AM, Johannes Sixt wrote: >> Am 31.01.2016 um 15:03 schrieb Aaron Gray: >>> I think I have found a possible difference in behaviour between >>> Windows git commandline distro and Linux git >>> >>> basically If I do a :-

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Doug Kelly
On Sun, Jan 31, 2016 at 8:50 AM, Johannes Sixt wrote: > Am 31.01.2016 um 15:03 schrieb Aaron Gray: >> >> Hi, >> >> I think I have found a possible difference in behaviour between >> Windows git commandline distro and Linux git >> >> basically If I do a :- >> >> git mv logger.h Logger.h >> >>

Re: [bug] Possible Windows 'git mv' bug

2016-01-31 Thread Johannes Sixt
Am 31.01.2016 um 15:03 schrieb Aaron Gray: Hi, I think I have found a possible difference in behaviour between Windows git commandline distro and Linux git basically If I do a :- git mv logger.h Logger.h I get the following :- fatal: destination exists, source=lib/logger.h, destina

[bug] Possible Windows 'git mv' bug

2016-01-31 Thread Aaron Gray
Hi, I think I have found a possible difference in behaviour between Windows git commandline distro and Linux git basically If I do a :- git mv logger.h Logger.h I get the following :- fatal: destination exists, source=lib/logger.h, destination=lib/Logger.h It looks and smells like a b

Re: [PATCH] completion: verify-tag is not plumbing

2016-01-31 Thread SZEDER Gábor
Quoting John Keeping : According to command-list.txt, verify-tag is an ancillary interrogator, which means that it should be completed by "git verify-" in the same way as verify-commit. Remove it from the list of plumbing commands so that it is treated as porcelain and completed. I'm not sur

[PATCH] completion: verify-tag is not plumbing

2016-01-31 Thread John Keeping
According to command-list.txt, verify-tag is an ancillary interrogator, which means that it should be completed by "git verify-" in the same way as verify-commit. Remove it from the list of plumbing commands so that it is treated as porcelain and completed. Signed-off-by: John Keeping --- contr

Re: [PATCH 1/6] give "nbuf" strbuf a more meaningful name

2016-01-31 Thread Jeff King
On Sun, Jan 31, 2016 at 12:54:29PM +0100, Johannes Schindelin wrote: > Hi Peff, > > On Sun, 31 Jan 2016, Jeff King wrote: > > > > It's a shame that we can't just factor out this common > > > code, but I don't think it's quite long enough to merit > > > the boilerplate. The interesting part of ea

Re: [PATCH 1/6] give "nbuf" strbuf a more meaningful name

2016-01-31 Thread Johannes Schindelin
Hi Peff, On Sun, 31 Jan 2016, Jeff King wrote: > On Sun, Jan 31, 2016 at 12:54:29PM +0100, Johannes Schindelin wrote: > > > On Sun, 31 Jan 2016, Jeff King wrote: > > > > > > It's a shame that we can't just factor out this common > > > > code, but I don't think it's quite long enough to merit >

Re: [PATCH 6/6] apply, ls-files: simplify "-z" parsing

2016-01-31 Thread Johannes Schindelin
Hi Peff, On Sun, 31 Jan 2016, Jeff King wrote: > I left this one for last, because it's the most questionable. I like the simplification... ;-) The other patches in this series look fine to me. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a messa

Re: [PATCH 1/6] give "nbuf" strbuf a more meaningful name

2016-01-31 Thread Johannes Schindelin
Hi Peff, On Sun, 31 Jan 2016, Jeff King wrote: > > It's a shame that we can't just factor out this common > > code, but I don't think it's quite long enough to merit > > the boilerplate. The interesting part of each function > > happens inside the loop. If C had lambdas, we could do > > something

git log -g bizarre behaviour

2016-01-31 Thread Dennis Kaarsemaker
I'm attempting to understand the log [-g] / reflog code enough to untangle them and make reflog walking work for more than just commit objects [see gmane 283169]. I found something which I think is wrong, and would break after my changes. git log -g HEAD^ and git log -g v2.7.0^ give no output. Thi

[PATCH 6/6] apply, ls-files: simplify "-z" parsing

2016-01-31 Thread Jeff King
As a short option, we cannot handle negation. Thus a callback handling "unset" is overkill, and we can just use OPT_SET_INT instead to handle setting the option. Signed-off-by: Jeff King --- I left this one for last, because it's the most questionable. Unlike the previous "-z" case, we're setting

[PATCH 5/6] checkout-index: disallow "--no-stage" option

2016-01-31 Thread Jeff King
We do not really expect people to use "--no-stage", but if they do, git currently segfaults. We could instead have it undo the effects of a previous "--stage", but this gets tricky around the "to_tempfile" flag. We cannot simply reset it to 0, because we don't know if it was set by a previous "--st

[PATCH 4/6] checkout-index: handle "--no-index" option

2016-01-31 Thread Jeff King
The parsing of "--index" is done in a callback, but it does not handle an "unset" option. We don't necessarily expect anyone to use this, but the current behavior is to treat it exactly like "--index", which would probably be surprising. Instead, let's just turn it into an OPT_BOOL, and handle it

[PATCH 3/6] checkout-index: handle "--no-prefix" option

2016-01-31 Thread Jeff King
We use a custom callback to parse "--prefix", but it does not handle the "unset" case. As a result, passing "--no-prefix" will cause a segfault. We can fix this by switching it to an OPT_STRING, which makes "--no-prefix" counteract a previous "--prefix". Note that this assigns NULL, so we bump our

[PATCH 2/6] checkout-index: simplify "-z" option parsing

2016-01-31 Thread Jeff King
Now that we act as a simple bool, there's no need to use a custom callback. Signed-off-by: Jeff King --- builtin/checkout-index.c | 12 ++-- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c index d8d7bd3..3b913d1 100644 --

[PATCH 1/6] give "nbuf" strbuf a more meaningful name

2016-01-31 Thread Jeff King
It's a common pattern in our code to read paths from stdin, separated either by newlines or NULs, and unquote as necessary. In each of these five cases we use "nbuf" to temporarily store the unquoted value. Let's give it the more meaningful name "unquoted", which makes it easier to understand the p

[PATCH 0/6] post-strbuf_getline cleanups

2016-01-31 Thread Jeff King
As promised, here are the "how about this on top" patches that came out of the discussion for the "strbuf_getline" series in: http://thread.gmane.org/gmane.comp.version-control.msysgit/21773/focus=284001 As I looked further at some of the option-parsing cleanups, I realized that some of them ar