Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Junio C Hamano
Lars Schneider writes: > Jeff Merkey made me aware of http://kernelnewbies.org/FirstKernelPatch [2] > where I found checkpatch.pl [3]. Would it make sense to check all commits > that are not in next/master/maint with this script on Travis-CI? That does not help very

Re: COPYING tabs vs whitespaces

2016-02-09 Thread Stefan Beller
As a reference for this discussion, see c376d96 in git.git or e00bfcbf04 in linux.git which deals with whitespaces in the developers certificate of origin. Just send a patch, I'd say. Thanks, Stefan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Making the "Note from the maintainer" information discoverable

2016-02-09 Thread Matt McCutchen
On Mon, 2016-02-08 at 14:16 -0800, Junio C Hamano wrote: > Jeff King writes: > > > FWIW, as the person who wrote that section, I think that is a good > > addition.  We do have a link to Simon Tatham's bug-reporting guide, > > but > > this is a good place to put project-specific

Re: git show doesn't work on file names with square brackets

2016-02-09 Thread Junio C Hamano
Jeff King writes: > Subject: [PATCH] check_filename: tighten requirements for dwim-wildcards > > Commit 28fcc0b (pathspec: avoid the need of "--" when > wildcard is used, 2015-05-02) introduced a convenience to > our dwim-parsing: when "--" is not present, we guess that > items

Re: update_linked_gitdir writes relative path to .git/worktrees//gitdir

2016-02-09 Thread Matt McCutchen
On Mon, 2016-02-08 at 14:16 -0800, Junio C Hamano wrote: > Jeff King writes: > > > FWIW, as the person who wrote that section, I think that is a good > > addition.  We do have a link to Simon Tatham's bug-reporting guide, but > > this is a good place to put project-specific

git(1) man page has link to out-of-date googlecode site

2016-02-09 Thread Matt McCutchen
I noticed that near the top of the git(1) man page, there is a link to  http://git-htmldocs.googlecode.com/git/git.html, which apparently has not been updated since August 2015 (https://code.google.com/archive/p/git-htmldocs/source/default/commits). Should this link just be removed, or replaced

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Stefan Beller
On Tue, Feb 9, 2016 at 10:42 AM, Junio C Hamano wrote: > Lars Schneider writes: > >> Jeff Merkey made me aware of http://kernelnewbies.org/FirstKernelPatch [2] >> where I found checkpatch.pl [3]. Would it make sense to check all commits >> that are

[PATCH] git.txt: encourage bug reporters to test recent versions

2016-02-09 Thread Matt McCutchen
Specifically, the latest released version or the "next" branch, as reporters are willing. This is based on: http://marc.info/?l=git=145496979420513=2 Signed-off-by: Matt McCutchen --- Documentation/git.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-)

Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

2016-02-09 Thread Johannes Schindelin
Hi Peff (and other interested parties), On Mon, 8 Feb 2016, Jeff King wrote: > On Mon, Feb 08, 2016 at 11:43:19AM -0800, Junio C Hamano wrote: > > > The version in 'master' that does > > > > echo "#!/bin/sh" >exec.sh && > > chmod +x exec.sh && > > > > should be

Re: Merging branches with smudge filter

2016-02-09 Thread Michael J Gruber
[Please bottom-reply on this list] Leonardo venit, vidit, dixit 08.02.2016 18:52: > Hi. I understand what you mean, but if that's the case, I don't get > how every file was merged successfully despite the encryption, except > two of them. I thought the smudge filter was supposed to be applied to >

Re: [PATCH] test-path-utils: use xsnprintf in favor of strcpy

2016-02-09 Thread Johannes Schindelin
Hi Peff, On Mon, 8 Feb 2016, Jeff King wrote: > This strcpy will never overflow because it's copying from > baked-in test data. But we would prefer to avoid strcpy > entirely, as it makes it harder to audit for real security > bugs. > > Signed-off-by: Jeff King ACK, of course.

Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

2016-02-09 Thread Johannes Schindelin
Hi Junio, On Mon, 8 Feb 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > write_script is a semantically unambiguous way to specify what we *want*. > > And it would allow us to handle chmod specifically for Windows *in one > > place only*. > >

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Lars Schneider
On 08 Feb 2016, at 13:25, Jeff King wrote: > On Mon, Feb 08, 2016 at 09:59:18AM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> The global Travis-CI environment variable CFLAGS did not override the >> CFLAGS variable in the

Re: [PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary

2016-02-09 Thread Torsten Bögershausen
On 02/08/2016 07:27 PM, Junio C Hamano wrote: > tbo...@web.de writes: > >> From: Torsten Bögershausen >> >> When core.autocrlf is set to false, and no attributes are set, the file >> is treated as binary. > This, and also on the title, I know by "binary" you mean "no > conversion

git worktree fails to recreate existing branch even with -B

2016-02-09 Thread Kirill Likhodedov
Git doesn’t allow me to execute git worktree add -B where already exists in the repository. The command prints the following: Preparing (identifier ) fatal: Refusing to point HEAD outside of refs/ I’m trying to create a worktree on an existing branch , which should point to .

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

2016-02-09 Thread Karthik Nayak
On Sun, Feb 7, 2016 at 7:17 PM, Andreas Schwab wrote: > Karthik Nayak writes: > >> + if ((( arg && len == arg - sp) || >> +(!arg && len == ep - sp )) && > > len == (arg ? arg : ep) - sp &&

Re: git(1) man page has link to out-of-date googlecode site

2016-02-09 Thread Junio C Hamano
Matt McCutchen writes: > I noticed that near the top of the git(1) man page, there is a link to > http://git-htmldocs.googlecode.com/git/git.html, which apparently has > not been updated since August 2015 Thanks for noticing. Yes, that should be corrected. > Should

Re: [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > + for (; pp->count < pp->list.nr; pp->count++) { > + const struct submodule *sub = NULL; > + const struct cache_entry *ce = pp->list.entries[pp->count]; > + struct strbuf displaypath_sb = STRBUF_INIT; > +

Re: [PATCHv9 0/6] Expose submodule parallelism to the user

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > This replaces sb/submodule-parallel-update. > (which is based on sb/submodule-parallel-fetch) > > Thanks to Junio and Jonathan for review! > > * s/config_parallel_submodules/parallel_submodules/ as it is not in config any > more. Also ease up the

Re: [PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Feb 9, 2016 at 1:08 PM, Junio C Hamano wrote: >>> + } else if (!strcmp(item.buf, "update")) { >>> + if (!value) >>> + ret = config_error_nonbool(var); >>> + else if

Re: [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > +++ b/submodule.c [...] > @@ -169,7 +170,13 @@ void set_diffopt_flags_from_submodule_config(struct > diff_options *diffopt, > > int submodule_config(const char *var, const char *value, void *cb) > { > - if (starts_with(var, "submodule.")) > + if

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Ramsay Jones
On 09/02/16 17:47, Junio C Hamano wrote: > Jeff King writes: > >> Perhaps. I'm not sure that people actually use checkpatch.pl for git. >> >> Out of curiosity, I tried: >> >> mkdir out >> git format-patch -o out v2.6.0..v2.7.0 >> checkpatch.pl out/* >> >> It's rather

Re: [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > This allows to configure fetching and updating in parallel > without having the command line option. > > This moved the responsibility to determine how many parallel processes > to start from builtin/fetch to submodule.c as we need a way to communicate

Re: [PATCHv9 0/6] Expose submodule parallelism to the user

2016-02-09 Thread Stefan Beller
On Tue, Feb 9, 2016 at 1:39 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> This replaces sb/submodule-parallel-update. >> (which is based on sb/submodule-parallel-fetch) >> >> Thanks to Junio and Jonathan for review! >> >> *

Re: [PATCH] mergetool: reorder vim/gvim buffers in three-way diffs

2016-02-09 Thread Junio C Hamano
Junio C Hamano writes: > Dickson Wong writes: > >> When invoking default (g)vimdiff three-way merge, the merged file is >> loaded as the first buffer but moved to the bottom as the fourth window. >> This causes a disconnect between vim commands that

Re: [PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > Currently submodule..update is only handled by git-submodule.sh. > C code will start to need to make use of that value as more of the > functionality of git-submodule.sh moves into library code in C. > > Add the update field to 'struct submodule' and

Re: [PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Stefan Beller
On Tue, Feb 9, 2016 at 1:08 PM, Junio C Hamano wrote: >> + } else if (!strcmp(item.buf, "update")) { >> + if (!value) >> + ret = config_error_nonbool(var); >> + else if (!me->overwrite && >> + submodule->update !=

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

2016-02-09 Thread Stefan Beller
On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano wrote: > Alex Henrie writes: > >> I couldn't find any other examples of people referring to this character >> as a "blank". >> >> Signed-off-by: Alex Henrie >> --- > > Any comments

[PATCHv9 0/6] Expose submodule parallelism to the user

2016-02-09 Thread Stefan Beller
This replaces sb/submodule-parallel-update. (which is based on sb/submodule-parallel-fetch) Thanks to Junio and Jonathan for review! * s/config_parallel_submodules/parallel_submodules/ as it is not in config any more. Also ease up the default setting. * use an enum for submodule update

[PATCHv9 6/6] clone: allow an explicit argument for parallel submodule clones

2016-02-09 Thread Stefan Beller
Just pass it along to "git submodule update", which may pick reasonable defaults if you don't specify an explicit number. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 6 +- builtin/clone.c | 19 +--

[PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Stefan Beller
This allows to configure fetching and updating in parallel without having the command line option. This moved the responsibility to determine how many parallel processes to start from builtin/fetch to submodule.c as we need a way to communicate "The user did not specify the number of parallel

[PATCHv9 2/6] submodule-config: drop check against NULL

2016-02-09 Thread Stefan Beller
Adhere to the common coding style of Git and not check explicitly for NULL throughout the file. There are still other occurrences in the code base but that is usually inside of conditions with side effects. Signed-off-by: Stefan Beller --- submodule-config.c | 6 +++--- 1

[PATCHv9 5/6] submodule update: expose parallelism to the user

2016-02-09 Thread Stefan Beller
Expose possible parallelism either via the "--jobs" CLI parameter or the "submodule.fetchJobs" setting. By having the variable initialized to -1, we make sure 0 can be passed into the parallel processing machine, which will then pick as many parallel workers as there are CPUs. Signed-off-by:

[PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Stefan Beller
Currently submodule..update is only handled by git-submodule.sh. C code will start to need to make use of that value as more of the functionality of git-submodule.sh moves into library code in C. Add the update field to 'struct submodule' and populate it so it can be read as sm->update or from

[PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

2016-02-09 Thread Stefan Beller
This introduces a new helper function in git submodule--helper which takes care of cloning all submodules, which we want to parallelize eventually. Some tests (such as empty URL, update_mode=none) are required in the helper to make the decision for cloning. These checks have been moved into the C

Re: update_linked_gitdir writes relative path to .git/worktrees//gitdir

2016-02-09 Thread Junio C Hamano
Matt McCutchen writes: > See my revised proposed text here: > > https://github.com/git/git-scm.com/pull/676/files If somebody says "The ancient version I use has this bug, it does not reproduce with 'next'", the first thing we would ask would be "Does it still happen on

Re: [PATCHv9 0/6] Expose submodule parallelism to the user

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: >>> * This seems to clash with 00/20] refs backend. Applied this on top of a merge between the current 'master' and 'sb/submodule-parallel-update' topic to untangle the dependency; otherwise there is no way for this topic to make progress

Re: [PATCHv9 2/6] submodule-config: drop check against NULL

2016-02-09 Thread Jonathan Nieder
Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > submodule-config.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Jonathan Nieder -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > submodule-config.c | 22 ++ > submodule-config.h | 11 +++ > 2 files changed, 33 insertions(+) Yay, this is much clearer. Thanks for indulging. [...] > +++ b/submodule-config.c

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

2016-02-09 Thread Junio C Hamano
Alex Henrie writes: > I couldn't find any other examples of people referring to this character > as a "blank". > > Signed-off-by: Alex Henrie > --- Any comments on this from anybody other than the author that I missed to support this change? >

Re: [PATCHv9 1/6] submodule-config: keep update strategy around

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > + else { > + submodule->update_command = NULL; > + if (!strcmp(value, "none")) > + submodule->update = SM_UPDATE_NONE; > + else if (!strcmp(value,

Re: COPYING tabs vs whitespaces

2016-02-09 Thread Petr Stodulka
On 9.2.2016 19:40, Stefan Beller wrote: > As a reference for this discussion, > see c376d96 in git.git or e00bfcbf04 in linux.git > which deals with whitespaces in the developers certificate of origin. > > Just send a patch, I'd say. > > Thanks, > Stefan > -- > To unsubscribe from this list:

Re: [PATCH v3 5/7] convert: auto_crlf=false and no attributes set: same as binary

2016-02-09 Thread Junio C Hamano
Torsten Bögershausen writes: >> * convert_attrs() has "If BINARY don't do anything and return". >>Will the patch change behaviour for the "not-autocrlf, >>CRLF_GUESS" case in this codepath? I think ca->crlf_action used >>to be left as CRLF_GUESS here before the

Re: [PATCH v6 02/11] grep: break down an "if" stmt in preparation for next changes

2016-02-09 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > grep.c | 6 -- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/grep.c b/grep.c > index 7b2b96a..e739d20 100644 > --- a/grep.c > +++ b/grep.c > @@ -403,9

Re: [PATCH v6 04/11] test-regex: expose full regcomp() to the command line

2016-02-09 Thread Junio C Hamano
Eric Sunshine writes: > On Fri, Feb 5, 2016 at 9:03 PM, Nguyễn Thái Ngọc Duy > wrote: >> diff --git a/test-regex.c b/test-regex.c >> @@ -21,8 +38,38 @@ static int test_regex_bug(void) >> int main(int argc, char **argv) >> { >> + const char

Re: [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

2016-02-09 Thread Jonathan Nieder
Stefan Beller wrote: > This introduces a new helper function in git submodule--helper > which takes care of cloning all submodules, which we want to > parallelize eventually. Neat. [...] > As we can only access the stderr channel from within the parallel > processing engine, we need to reroute

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: > On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano wrote: >> Alex Henrie writes: >> >>> I couldn't find any other examples of people referring to this character >>> as a "blank". >>> >>> Signed-off-by: Alex

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Junio C Hamano
Roberto Tyley writes: > I've not personally run checkpatch.pl (as Peff mentioned, it's not > actually a documented part of the Git project's recommend contribution > workflow) - I'm still trying to understand whether it will restrict > it's errors to just the things that

Re: [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Stefan Beller
On Tue, Feb 9, 2016 at 2:34 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> +++ b/submodule.c > [...] >> @@ -169,7 +170,13 @@ void set_diffopt_flags_from_submodule_config(struct >> diff_options *diffopt, >> >> int submodule_config(const char *var, const char

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Roberto Tyley
On 9 February 2016 at 18:42, Junio C Hamano wrote: > Lars Schneider writes: >> Jeff Merkey made me aware of http://kernelnewbies.org/FirstKernelPatch [2] >> where I found checkpatch.pl [3]. Would it make sense to check all commits >> that are not in

What's cooking in git.git (Feb 2016, #03; Tue, 9)

2016-02-09 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Junio C Hamano
Stefan Beller writes: >> int git_config_nonnegative_int(const char *name, const char *value) >> { >> int ret; >> if (!git_parse_nonnegative_int(value, )) >> die_bad_number(name, value); >>

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

2016-02-09 Thread Alex Henrie
2016-02-09 16:00 GMT-07:00 Junio C Hamano : > Stefan Beller writes: > >> On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano wrote: >>> Alex Henrie writes: >>> I couldn't find any other examples of people

Re: [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-09 Thread Junio C Hamano
Junio C Hamano writes: > I actually do not think we mind git_parse_int(), git_parse_long(), > and git_parse_uint() to complement git_parse_ulong(). I am not > enthused by the "nonnegative-int" thing, though. > > Do we have enough cases where we want to use signed type and

Re: [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning

2016-02-09 Thread Jacob Keller
On Tue, Feb 9, 2016 at 12:54 PM, Stefan Beller wrote: > This introduces a new helper function in git submodule--helper > which takes care of cloning all submodules, which we want to > parallelize eventually. > > Some tests (such as empty URL, update_mode=none) are required in

Re: [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/*

2016-02-09 Thread Junio C Hamano
Mikko Rapeli writes: > Sorry, can't reproduce the problem where submodules stayed in the tree until > git clean was called with two -f's. > > You are right in removing the second part. Thanks, then let's do this. -- >8 -- From: Matt McCutchen Date:

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Jeff King
On Tue, Feb 09, 2016 at 11:06:17AM +0100, Lars Schneider wrote: > I collected the warnings from Junio's Make [1] script and merged them with > yours. This is the resulting warning list for clang and gcc: > > -Wdeclaration-after-statement -Wno-format-zero-length -Wold-style-definition >

Re: [PATCH v1] travis-ci: override CFLAGS properly, add -Wdeclaration-after-statement

2016-02-09 Thread Junio C Hamano
Jeff King writes: > Perhaps. I'm not sure that people actually use checkpatch.pl for git. > > Out of curiosity, I tried: > > mkdir out > git format-patch -o out v2.6.0..v2.7.0 > checkpatch.pl out/* > > It's rather noisy, and after skimming, I'd say (subjectively) that only >

Re: [PATCH] t9100: fix breakage when SHELL_PATH is not /bin/sh

2016-02-09 Thread Junio C Hamano
Johannes Schindelin writes: > Besides, I am pretty certain that there is a test in t9100 that *does* > test the executable bit, properly requiring POSIXPERM. > > So I still would be in favor of using write_script: 1) our *intention* is > to write a script, even if we

Re: [PATCH] Documentation/git-clean.txt: don't mention deletion of .git/modules/*

2016-02-09 Thread Matt McCutchen
On Tue, 2016-02-09 at 09:34 -0800, Junio C Hamano wrote: > Mikko Rapeli writes: > > > Sorry, can't reproduce the problem where submodules stayed in the > > tree until > > git clean was called with two -f's. > > > > You are right in removing the second part. > > Thanks,