Re: RFC: Resumable clone based on hybrid "smart" and "dumb" HTTP

2016-02-13 Thread Shawn Pearce
On Wed, Feb 10, 2016 at 1:49 PM, Jeff King wrote: > On Wed, Feb 10, 2016 at 12:11:46PM -0800, Shawn Pearce wrote: > >> On Wed, Feb 10, 2016 at 10:59 AM, Shawn Pearce wrote: >> > >> > ... Thoughts? >> >> Several of us at $DAY_JOB talked about this more today and thought a >> variation makes more s

[PATCH] remote-curl: Include curl_errorstr on SSL setup failures

2016-02-13 Thread Shawn Pearce
For curl error 35 (CURLE_SSL_CONNECT_ERROR) users need the additional text stored in CURLOPT_ERRORBUFFER to debug why the connection did not start. This is curl_errorstr inside of http.c, so include that in the message if it is non-empty. Sometimes HTTP response codes aren't yet available, such as

Re: [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 01:00:22PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > ... I did not realize then that my patch from: > > > > http://article.gmane.org/gmane.comp.version-control.git/262641 > > > > was never picked up (but of course I've been carrying it in my tree for > > a

Re: [PATCH] Disown ssh+git and git+ssh

2016-02-13 Thread Junio C Hamano
Carlos Martín Nieto writes: > These were silly from the beginning, but we have to support them for > compatibility. That doesn't mean we have to show them in the > documentation. These were already left out of the main list, but a > reference in the main manpage was left, so remove that. > > Also

Re: [PATCH v3 0/3] config: add '--sources' option to print the source of a config value

2016-02-13 Thread Junio C Hamano
Jeff King writes: > I'm actually opposed to "--verbose" because it is too vague. That is > fine for a human, but this is also an interface that we expect scripts > to parse, and which we therefore cannot later change without breaking > them. I am not prepared to set "--verbose" in stone as showin

Re: [PATCH v3 2/3] config: add 'type' to config_source struct that identifies config type

2016-02-13 Thread Junio C Hamano
Jeff King writes: >> @@ -1104,6 +1106,7 @@ int git_config_from_buf(config_fn_t fn, const char >> *name, const char *buf, >> top.u.buf.buf = buf; >> top.u.buf.len = len; >> top.u.buf.pos = 0; >> +top.type = "blob"; >> top.name = name; >> top.path = NULL; >> top.d

Re: [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior

2016-02-13 Thread Junio C Hamano
Jeff King writes: > ... I did not realize then that my patch from: > > http://article.gmane.org/gmane.comp.version-control.git/262641 > > was never picked up (but of course I've been carrying it in my tree for > a year). Hmm, I do not see how it happened, either. It is not like I was offline

Re: [PATCH] t5570: add tests for "git fetch -v"

2016-02-13 Thread Junio C Hamano
Eric Wong writes: > Now that git_connect is more information about connectivity > progress after: ("pass transport verbosity down to git_connect") > we should ensure it remains so for future users who need to > to diagnose networking problems. Thanks. > diff --git a/t/t5570-git-daemon.sh b/t/t5

Re: `.git` symlink makes `git submodule add` fail

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 05:20:09AM +0100, Vít Novotný wrote: > On Fri, Feb 12, 2016 at 01:27:33PM -0500, Jeff King wrote: > > On Fri, Feb 12, 2016 at 10:19:38AM -0800, Junio C Hamano wrote: > > > > > >> Is this a bug, or is the ability to symlink `.git` just a happy > > > >> coincidence? > > > >

Re: [PATCH v3 0/3] config: add '--sources' option to print the source of a config value

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 09:43:34AM -0500, Mike Rappazzo wrote: > > I renamed the flag from "--source" to "--show-origin" as I got the > > impression > > that Sebastian, Peff and Ramsay seem to be all OK with "--show-origin". > > I know that I am late to the party here, but why not make the optio

Re: [PATCH v3 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 01:04:12PM -0500, Jeff King wrote: > On Sat, Feb 13, 2016 at 12:44:49PM -0500, Jeff King wrote: > > > > +test_expect_success '--show-origin' ' > > [...] > > I see you split this up more, but there's still quite a bit going on in > > this one block. IMHO, it would be more c

Re: [PATCH v3 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 12:44:49PM -0500, Jeff King wrote: > > +test_expect_success '--show-origin' ' > [...] > I see you split this up more, but there's still quite a bit going on in > this one block. IMHO, it would be more customary in our tests to put the > setup into one test_expect_success bl

Re: [PATCH v3 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 03:24:16PM +0100, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > If config values are queried using 'git config' (e.g. via --get, > --get-all, --get-regexp, or --list flag) then it is sometimes hard to > find the configuration file where the values were define

Re: [PATCH v3 0/3] config: add '--sources' option to print the source of a config value

2016-02-13 Thread Sebastian Schuberth
On Sat, Feb 13, 2016 at 3:43 PM, Mike Rappazzo wrote: >> I renamed the flag from "--source" to "--show-origin" as I got the impression >> that Sebastian, Peff and Ramsay seem to be all OK with "--show-origin". > > I know that I am late to the party here, but why not make the option > `--verbose`

Re: [PATCH v3 2/3] config: add 'type' to config_source struct that identifies config type

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 03:24:15PM +0100, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > Use the config type to print more detailed error messages that inform > the user about the origin of a config error (file, stdin, blob). This looks OK overall. A few minor nits... > @@ -1104,6

Re: [PATCH v3 1/3] git-config.txt: describe '--includes' default behavior

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 03:24:14PM +0100, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > Helped-by: Jeff King > Signed-off-by: Lars Schneider > --- > Documentation/git-config.txt | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-config.

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-13 Thread Johannes Schindelin
Hi Gábor, On Sat, 13 Feb 2016, SZEDER Gábor wrote: > Maybe even run some numbers on Windows? Here you are: -- snip -- # Junio's 494398473, i.e. `master $ cur=m ; time __gitcomp_nl "$(__git_refs '' 1)" real0m8.260s user0m0.265s sys 0m0.216s # Gábor's 6fc6f416, i.e. with strip=2 $ c

Re: RFC: Resumable clone based on hybrid "smart" and "dumb" HTTP

2016-02-13 Thread Jeff King
On Fri, Feb 12, 2016 at 07:40:43PM -0600, Blake Burkhart wrote: > On Wed, Feb 10, 2016 at 3:49 PM, Jeff King wrote: > >> 2. Servers that support resumable clone include a "resumable" > >> capability in the advertisement. > > > > Because the magic happens in the git protocol, that would mean this

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-13 Thread Jeff King
On Sat, Feb 13, 2016 at 02:07:12AM +0100, SZEDER Gábor wrote: > >So I think switching to :strip is an improvement in both correctness > >_and_ performance. > > Right. I was more worried about __git_refs(), because it asks for > everything under refs/heads/, refs/tags/ and refs/remotes/, and its

Re: [PATCH v3 0/3] config: add '--sources' option to print the source of a config value

2016-02-13 Thread Mike Rappazzo
On Sat, Feb 13, 2016 at 9:24 AM, wrote: > From: Lars Schneider > > diff to v2: > * rename cmd to cmdline > * rename function current_config_name to current_config_type_name > * add 'type' to config_source struct that identifies config type > * fix config stdin error output and add test case "inv

[PATCH v3 2/3] config: add 'type' to config_source struct that identifies config type

2016-02-13 Thread larsxschneider
From: Lars Schneider Use the config type to print more detailed error messages that inform the user about the origin of a config error (file, stdin, blob). Signed-off-by: Lars Schneider --- config.c | 17 ++--- t/t1300-repo-config.sh | 8 +++- t/t1308-config-set.

[PATCH v3 3/3] config: add '--show-origin' option to print the origin of a config value

2016-02-13 Thread larsxschneider
From: Lars Schneider If config values are queried using 'git config' (e.g. via --get, --get-all, --get-regexp, or --list flag) then it is sometimes hard to find the configuration file where the values were defined. Teach 'git config' the '--show-origin' option to print the source configuration f

[PATCH v3 1/3] git-config.txt: describe '--includes' default behavior

2016-02-13 Thread larsxschneider
From: Lars Schneider Helped-by: Jeff King Signed-off-by: Lars Schneider --- Documentation/git-config.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 2608ca7..59b1c95 100644 --- a/Documentation/git-conf

[PATCH v3 0/3] config: add '--sources' option to print the source of a config value

2016-02-13 Thread larsxschneider
From: Lars Schneider diff to v2: * rename cmd to cmdline * rename function current_config_name to current_config_type_name * add 'type' to config_source struct that identifies config type * fix config stdin error output and add test case "invalid stdin config" * change delimiter between type and

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-13 Thread SZEDER Gábor
Quoting Johannes Schindelin : Hi Gábor, On Sat, 13 Feb 2016, SZEDER Gábor wrote: $ cur=m ; time __gitcomp_nl "$(__git_refs '' 1)" real 0m7.641s user 0m5.888s sys 0m1.832s Using 'refname:strip=2' for both 'git for-each-ref' in __git_refs(): $ cur=m ; time __gitcomp_nl "$(__git_ref

Re: GSoC 2016: applications open, deadline = Fri, 19/2

2016-02-13 Thread Matthieu Moy
Jeff King writes: > On Fri, Feb 12, 2016 at 08:10:34AM +0100, Matthieu Moy wrote: > >> So, that makes it 4 possible co-mentors, i.e. 2 potential slots. Not >> much, but it starts looking like last year ... ;-). >> >> Peff, would you be willing to co-admin with me (that would be cool, you >> are

Re: [PATCH] git-completion.bash: always swallow error output of for-each-ref

2016-02-13 Thread Johannes Schindelin
Hi Gábor, On Sat, 13 Feb 2016, SZEDER Gábor wrote: > $ cur=m ; time __gitcomp_nl "$(__git_refs '' 1)" > > real 0m7.641s > user 0m5.888s > sys 0m1.832s > > Using 'refname:strip=2' for both 'git for-each-ref' in __git_refs(): > > $ cur=m ; time __gitcomp_nl "$(__git_refs '' 1)" > > re