Re: [RFC] On the --depth argument when fetching with submodules

2016-02-05 Thread Fredrik Gustafsson
On Fri, Feb 05, 2016 at 04:05:01PM -0800, Junio C Hamano wrote: > Stefan Beller writes: > > > Currently when cloning a project, including submodules, the --depth argument > > is passed on recursively, i.e. when cloning with "--depth 2", both the > > superproject as well as the submodule will have

make notes show up in gitk graph view?

2016-02-05 Thread Britton Kerin
I'd like to be able to mark dysfunctional stuff that ended up in the repo but we don't want to delete with DONT_USE or something, and have it show up like tags do, but not have to be unique. If git notes don't work for this purpose maybe something else does? -- To unsubscribe from this list: send

[PATCH v9] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
Changes between v8 -> v9: * Rebased and tested on v2.7.1. * Made a small correction suggested by Junio in the documentation for the new option: s/upon/before v8: http://article.gmane.org/gmane.comp.version-control.git/285646 -- To unsubscribe from this list: send the line "unsubscribe git" in

[PATCH v9 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
It used to be that: git config --global user.email "(none)" was a viable way for people to force themselves to set user.email in each repository. This was helpful for people with more than one email address, targeting different email addresses for different clones, as it barred git from creat

[PATCH v9 1/2] fmt_ident: refactor strictness checks

2016-02-05 Thread Dan Aloni
From: Jeff King This function has evolved quite a bit over time, and as a result, the logic for "is this an OK ident" has been sprinkled throughout. This ends up with a lot of redundant conditionals, like checking want_name repeatedly. Worse, we want to know in many cases whether we are using the

is there interest in tooltip patches for gitk?

2016-02-05 Thread Britton Kerin
or would they be regarded as too tricky to keep in sync with reality/other documentation? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: strange behavior with nonexistant or partially populated ~/.config/git/gitk

2016-02-05 Thread Britton Kerin
My bad, problem was I missed existence of .gitk (used only if ~/.config/git/gitk doesn't exist). On Fri, Feb 5, 2016 at 6:16 PM, Britton Kerin wrote: > If ~/.config/git/gitk doesn't exist, I get small fonts (fine) and ugly > hard-to-read dark green branch labels. > > The fix for the dark green pr

strange behavior with nonexistant or partially populated ~/.config/git/gitk

2016-02-05 Thread Britton Kerin
If ~/.config/git/gitk doesn't exist, I get small fonts (fine) and ugly hard-to-read dark green branch labels. The fix for the dark green problem is here: http://stackoverflow.com/questions/26025810/gtk-apps-show-green-too-dark But after doing: echo 'set headbgcolor lime' >~/.config/g

[PATCH v6 06/11] grep/icase: avoid kwsset when -F is specified

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Similar to the previous commit, we can't use kws on icase search outside ascii range. But we can't simply pass the pattern to regcomp/pcre like the previous commit because it may contain regex special characters, so we need to quote the regex first. To avoid misquote traps that could lead to undef

[PATCH v6 03/11] test-regex: isolate the bug test code

2016-02-05 Thread Nguyễn Thái Ngọc Duy
This is in preparation to turn test-regex into some generic regex testing command. Helped-by: Eric Sunshine Helped-by: Ramsay Jones Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t0070-fundamental.sh | 2 +- test-regex.c | 12 ++-- 2 files changed, 11 insertions(+), 3 deletions(-

[PATCH v6 10/11] diffcore-pickaxe: "share" regex error handling code

2016-02-05 Thread Nguyễn Thái Ngọc Duy
There's another regcomp code block coming in this function. By moving the error handling code out of this block, we don't have to add the same error handling code in the new block. Signed-off-by: Nguyễn Thái Ngọc Duy --- diffcore-pickaxe.c | 16 1 file changed, 8 insertions(+),

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

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- test-regex.c | 51 +-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/test-regex.c b/test-regex.c index 8c51f5a..d1a952c 100644 --- a/test-regex.c +++ b/test-regex.c @@ -1,4 +1,21 @@ #include

[PATCH v6 05/11] grep/icase: avoid kwsset on literal non-ascii strings

2016-02-05 Thread Nguyễn Thái Ngọc Duy
When we detect the pattern is just a literal string, we avoid heavy regex engine and use fast substring search implemented in kwsset.c. But kws uses git-ctype which is locale-independent so it does not know how to fold case properly outside ascii range. Let regcomp or pcre take care of this case in

[PATCH v6 11/11] diffcore-pickaxe: support case insensitive match on non-ascii

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Similar to the "grep -F -i" case, we can't use kws on icase search outside ascii range, so we quote the string and pass it to regcomp as a basic regexp and let regex engine deal with case sensitivity. The new test is put in t7812 instead of t4209-log-pickaxe because lib-gettext.sh might cause prob

[PATCH v6 08/11] gettext: add is_utf8_locale()

2016-02-05 Thread Nguyễn Thái Ngọc Duy
This function returns true if git is running under an UTF-8 locale. pcre in the next patch will need this. is_encoding_utf8() is used instead of strcmp() to catch both "utf-8" and "utf8" suffixes. When built with no gettext support, we peek in several env variables to detect UTF-8. pcre library m

[PATCH v6 07/11] grep/pcre: prepare locale-dependent tables for icase matching

2016-02-05 Thread Nguyễn Thái Ngọc Duy
The default tables are usually built with C locale and only suitable for LANG=C or similar. This should make case insensitive search work correctly for all single-byte charsets. Signed-off-by: Nguyễn Thái Ngọc Duy --- grep.c | 8 ++-- grep.h

[PATCH v6 09/11] grep/pcre: support utf-8

2016-02-05 Thread Nguyễn Thái Ngọc Duy
In the previous change in this function, we add locale support for single-byte encodings only. It looks like pcre only supports utf-* as multibyte encodings, the others are left in the cold (which is fine). We need to enable PCRE_UTF8 so pcre can find character boundary correctly. It's needed for

[PATCH v6 00/11] Fix icase grep on non-ascii

2016-02-05 Thread Nguyễn Thái Ngọc Duy
v6 fixes comments from Ramsay and Eric. Interdiff below. The only thing to add is, I decided not to replace !icase_non_ascii with icase_ascii_only. I went with spelling out "!icase || ascii_only". I think it expresses the intention better. diff --git a/grep.c b/grep.c index 2e4f71d..aed4fe0 100644

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

2016-02-05 Thread Nguyễn Thái Ngọc Duy
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 +403,11 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt) p->wo

[PATCH v6 01/11] grep: allow -F -i combination

2016-02-05 Thread Nguyễn Thái Ngọc Duy
-F means "no regex", not "case sensitive" so it should not override -i Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index 5526fd7..4be0df5 100644 --- a/builtin/grep.c +++ b/builtin/grep.

Re: [PATCHv8 5/9] submodule-config: introduce parse_generic_submodule_config

2016-02-05 Thread Stefan Beller
On Fri, Feb 5, 2016 at 5:23 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> This rewrites parse_config to distinguish between configs specific to >> one submodule and configs which apply generically to all submodules. >> We do not have generic submodule configs yet, but the next pat

Re: [PATCHv8 5/9] submodule-config: introduce parse_generic_submodule_config

2016-02-05 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > This rewrites parse_config to distinguish between configs specific to > one submodule and configs which apply generically to all submodules. > We do not have generic submodule configs yet, but the next patch will > introduce "submodule.fetchJobs". Does this mean that o

Re: [PATCHv8 3/9] submodule-config: remove name_and_item_from_var

2016-02-05 Thread Stefan Beller
On Fri, Feb 5, 2016 at 4:46 PM, Jonathan Nieder wrote: > Hi, > > Stefan Beller wrote: > >> --- a/submodule-config.c >> +++ b/submodule-config.c >> @@ -251,18 +235,19 @@ static int parse_config(const char *var, const char >> *value, void *data) >> { >> struct parse_config_parameter *me = da

Re: [PATCH 2/8] pack-objects: produce a stable pack when --skip is given

2016-02-05 Thread Junio C Hamano
> You noticed that tying the behavior only happens when the user asks > for it, right? I don't expect people to do resumable fetch/clone by > default. There are tradeoffs to make and they decide it, we offer > options. So, it does not really tie our hands in the normal case. You misread me. I do n

Re: [PATCHv8 4/9] submodule-config: slightly simplify lookup_or_create_by_name

2016-02-05 Thread Jonathan Nieder
Stefan Beller wrote: > No need for a strbuf, when all we use it for, is duplicating a string. > > Signed-off-by: Stefan Beller > --- > submodule-config.c | 5 + > 1 file changed, 1 insertion(+), 4 deletions(-) Reviewed-by: Jonathan Nieder -- To unsubscribe from this list: send the line "un

Re: [PATCHv8 3/9] submodule-config: remove name_and_item_from_var

2016-02-05 Thread Jonathan Nieder
Hi, Stefan Beller wrote: > --- a/submodule-config.c > +++ b/submodule-config.c > @@ -251,18 +235,19 @@ static int parse_config(const char *var, const char > *value, void *data) > { > struct parse_config_parameter *me = data; > struct submodule *submodule; > - struct strbuf name

What's cooking in git.git (Feb 2016, #02; Fri, 5)

2016-02-05 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 described

[ANNOUNCE] Git v2.7.1

2016-02-05 Thread Junio C Hamano
The latest maintenance release Git v2.7.1 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.7.1' tag and the 'maint' branch that the tag points at: url = https://kernel

A note from the maintainer

2016-02-05 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

Re: [RFC] On the --depth argument when fetching with submodules

2016-02-05 Thread Junio C Hamano
Stefan Beller writes: > Currently when cloning a project, including submodules, the --depth argument > is passed on recursively, i.e. when cloning with "--depth 2", both the > superproject as well as the submodule will have a depth of 2. It is not > garantueed that the commits as specified by th

Re: Clarification on the git+ssh and ssh+git schemes

2016-02-05 Thread Carlos Martín Nieto
> On 05 Feb 2016, at 14:11, Junio C Hamano wrote: > > Linus Torvalds writes: > >> On Fri, Feb 5, 2016 at 11:30 AM, Jeff King wrote: >>> >>> I suspect they were not really documented because nobody wanted to >>> encourage their use. I don't think it would be wrong to document that >>> they ex

Re: no luck with colors for branch names in gitk yet

2016-02-05 Thread John Keeping
On Fri, Feb 05, 2016 at 01:29:26PM -0900, Britton Kerin wrote: > On Fri, Feb 5, 2016 at 12:25 PM, Philip Oakley wrote: > > From: "Britton Kerin" > >> > >> Someone suggested using color.branch.upstream, I tried like this and > >> variants > >> > >> [color "branch"] > >> local = red bold > >> ups

Re: [PATCH 2/8] pack-objects: produce a stable pack when --skip is given

2016-02-05 Thread Duy Nguyen
On Sat, Feb 6, 2016 at 1:43 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c >> index 417c830..c58a9cb 100644 >> --- a/builtin/pack-objects.c >> +++ b/builtin/pack-objects.c >> @@ -2709,6 +2709,11 @@ int cmd_pack_objects(i

Re: [PATCH v8 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Junio C Hamano
Dan Aloni writes: > +user.useConfigOnly:: > + Instruct Git to avoid trying to guess defaults for 'user.email' > + and 'user.name', and instead retrieve the values only from the > + configuration. For example, if you have multiple email addresses > + and would like to use a differe

[RFC] On the --depth argument when fetching with submodules

2016-02-05 Thread Stefan Beller
Currently when cloning a project, including submodules, the --depth argument is passed on recursively, i.e. when cloning with "--depth 2", both the superproject as well as the submodule will have a depth of 2. It is not garantueed that the commits as specified by the superproject are included in t

Re: no luck with colors for branch names in gitk yet

2016-02-05 Thread Britton Kerin
On Fri, Feb 5, 2016 at 12:25 PM, Philip Oakley wrote: > From: "Britton Kerin" >> >> Someone suggested using color.branch.upstream, I tried like this and >> variants >> >> [color "branch"] >> local = red bold >> upstream = red bold >> >> Doesn't seem to matter what I put in for upstream, includi

[PATCH v8 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
It used to be that: git config --global user.email "(none)" was a viable way for people to force themselves to set user.email in each repository. This was helpful for people with more than one email address, targeting different email addresses for different clones, as it barred git from creat

[PATCH v8] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
Changes between v7 -> v8: * Proofing fixes suggestions by Eric. * Test script cleanup by Jeff. * Renumbered test script. v7: http://article.gmane.org/gmane.comp.version-control.git/285636 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger

[PATCH v8 1/2] fmt_ident: refactor strictness checks

2016-02-05 Thread Dan Aloni
From: Jeff King This function has evolved quite a bit over time, and as a result, the logic for "is this an OK ident" has been sprinkled throughout. This ends up with a lot of redundant conditionals, like checking want_name repeatedly. Worse, we want to know in many cases whether we are using the

Re: [PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Junio C Hamano
Jeff King writes: > This is sort-of about "commit", which would put it in the t75xx range. > But in some ways, it is even more fundamental than that. We don't seem > to have a lot of tests for ident stuff. The closest is the strict ident > stuff in t0007. Good point. >> +reprepare () { >> +

Re: [PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
On Fri, Feb 05, 2016 at 04:59:52PM -0500, Eric Sunshine wrote: > On Fri, Feb 05, 2016 at 11:29:06PM +0200, Dan Aloni wrote: > > It used to be that: > > > >git config --global user.email "(none)" > > > > was a viable way for people to force themselves to set user.email in > > each repository.

Re: Clarification on the git+ssh and ssh+git schemes

2016-02-05 Thread Junio C Hamano
Linus Torvalds writes: > On Fri, Feb 5, 2016 at 11:30 AM, Jeff King wrote: >> >> I suspect they were not really documented because nobody wanted to >> encourage their use. I don't think it would be wrong to document that >> they exist and are deprecated, though. > > They exist because some peopl

Re: [PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
On Fri, Feb 05, 2016 at 04:48:33PM -0500, Jeff King wrote: > On Fri, Feb 05, 2016 at 11:29:06PM +0200, Dan Aloni wrote: > > > diff --git a/t/t9904-per-repo-email.sh b/t/t9904-per-repo-email.sh > > new file mode 100755 > > index ..f2b33881e46b > > --- /dev/null > > +++ b/t/t9904-per-rep

Re: [PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Eric Sunshine
On Fri, Feb 05, 2016 at 11:29:06PM +0200, Dan Aloni wrote: > It used to be that: > >git config --global user.email "(none)" > > was a viable way for people to force themselves to set user.email in > each repository. This was helpful for people with more than one > email address, targeting di

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread Junio C Hamano
"brian m. carlson" writes: > On Fri, Feb 05, 2016 at 01:02:58PM -0800, Junio C Hamano wrote: >> Hmph, so documenting that :@ >> as a supported way might be an ugly-looking solution to the original >> problem. A less ugly-looking solution might be a boolean that can >> be set per URL (we already

Re: [PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 11:29:06PM +0200, Dan Aloni wrote: > diff --git a/t/t9904-per-repo-email.sh b/t/t9904-per-repo-email.sh > new file mode 100755 > index ..f2b33881e46b > --- /dev/null > +++ b/t/t9904-per-repo-email.sh Is t9904 the right place for this? Usually t99xx is for very

[PATCH v7 2/2] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
It used to be that: git config --global user.email "(none)" was a viable way for people to force themselves to set user.email in each repository. This was helpful for people with more than one email address, targeting different email addresses for different clones, as it barred git from creat

[PATCH v7] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
Changes between v6 -> v7: * Dropped patch: ident: cleanup wrt ident's source * Revised the documentation of the feature according to comments. * Revised the test according to comments. * Styling fix. v6: http://article.gmane.org/gmane.comp.version-control.git/285550 -- To unsubscribe from this l

[PATCH v7 1/2] fmt_ident: refactor strictness checks

2016-02-05 Thread Dan Aloni
From: Jeff King This function has evolved quite a bit over time, and as a result, the logic for "is this an OK ident" has been sprinkled throughout. This ends up with a lot of redundant conditionals, like checking want_name repeatedly. Worse, we want to know in many cases whether we are using the

Re: no luck with colors for branch names in gitk yet

2016-02-05 Thread Philip Oakley
From: "Britton Kerin" Someone suggested using color.branch.upstream, I tried like this and variants [color "branch"] local = red bold upstream = red bold Doesn't seem to matter what I put in for upstream, including invalid colors, gitk just ignores it and does the dark green for local branc

Re: [PATCH v6 2/3] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Dan Aloni
On Fri, Feb 05, 2016 at 11:31:34AM -0800, Junio C Hamano wrote: > > + If you have multiple email addresses that you would like to set > > + up per repository, you may want to set this to 'true' in the global > > + config, and then Git would prompt you to set user.email separately, > > + in

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread brian m. carlson
On Fri, Feb 05, 2016 at 01:02:58PM -0800, Junio C Hamano wrote: > Hmph, so documenting that :@ > as a supported way might be an ugly-looking solution to the original > problem. A less ugly-looking solution might be a boolean that can > be set per URL (we already have urlmatch-config infrastructure

Re: [PATCH v6 3/3] ident: cleanup wrt ident's source

2016-02-05 Thread Dan Aloni
On Fri, Feb 05, 2016 at 02:24:13PM -0500, Jeff King wrote: > On Fri, Feb 05, 2016 at 11:05:19AM -0800, Junio C Hamano wrote: > > > Dan Aloni writes: > > > > > This change condenses the variables that tells where we got the user's > > > ident into single enum, instead of a collection of booleans.

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread Junio C Hamano
"brian m. carlson" writes: > On Fri, Feb 05, 2016 at 12:18:22PM +0300, Dmitry Vilkov wrote: >> You are right, we are using a bare URL (without a username component). >> With username encoded in URL everything works just fine. But it's >> generally wrong to pass creds in URL (in my opinion) and se

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread brian m. carlson
On Fri, Feb 05, 2016 at 09:54:50AM -0800, Junio C Hamano wrote: > OK, as Brian said, that use case would need to be in the log > message, at least. I am curious, though, if you can give just a > random string to username, or at least that must match what the > underlying authentication mechanism u

no luck with colors for branch names in gitk yet

2016-02-05 Thread Britton Kerin
Someone suggested using color.branch.upstream, I tried like this and variants [color "branch"] local = red bold upstream = red bold Doesn't seem to matter what I put in for upstream, including invalid colors, gitk just ignores it and does the dark green for local branches -- To unsubscribe fr

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread brian m. carlson
On Fri, Feb 05, 2016 at 12:18:22PM +0300, Dmitry Vilkov wrote: > You are right, we are using a bare URL (without a username component). > With username encoded in URL everything works just fine. But it's > generally wrong to pass creds in URL (in my opinion) and security > policy of my employer pro

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Stefan Beller
On Fri, Feb 5, 2016 at 12:33 PM, Jonathan Nieder wrote: > Stefan Beller wrote: >> On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: >>> Stefan Beller wrote: > +++ b/submodule-config.h @@ -14,6 +14,7 @@ struct submodule { + const char *update; >>> >>> gitmodules(5) tells me

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Jonathan Nieder
Stefan Beller wrote: > On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: >> Stefan Beller wrote: >>> +++ b/submodule-config.h >>> @@ -14,6 +14,7 @@ struct submodule { >>> + const char *update; >> >> gitmodules(5) tells me the only allowed values are checkout, rebase, >> merge, and none.

Re: [PATCHv8 1/9] submodule-config: keep update strategy around

2016-02-05 Thread Stefan Beller
On Thu, Feb 4, 2016 at 4:59 PM, Jonathan Nieder wrote: > Hi, > > It's been a while since I looked at this series. Hopefully I can > come at it with some fresh eyes. Thanks for your perseverance. > > Stefan Beller wrote: > >> We need the submodule update strategies in a later patch. > > This desc

Re: [PATCHv8 6/9] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-05 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Feb 4, 2016 at 7:29 PM, Junio C Hamano wrote: >> Stefan Beller writes: >> ... >>> +static unsigned long parallel_jobs = -1; >> >> ... but I do not think this does > > So if we don't get the config option from builtin/fetch, we ask for > config_parallel_submod

[PATCH v4 15/21] init: allow alternate ref strorage to be set for new repos

2016-02-05 Thread David Turner
git init learns a new argument --ref-storage. Presently, only "files" is supported, but later we will add other storage backends. When this argument is used, the repository's extensions.refStorage configuration value is set (as well as core.repositoryformatversion), and the ref storage backend's

[PATCH v4 21/21] refs: tests for lmdb backend

2016-02-05 Thread David Turner
Add tests for the database backend. Signed-off-by: David Turner Helped-by: Dennis Kaarsemaker --- t/t1460-refs-lmdb-backend.sh| 1109 +++ t/t1470-refs-lmdb-backend-reflog.sh | 359 t/t1480-refs-lmdb-submodule.sh | 85 +++ t/test-lib.s

[PATCH v4 07/21] refs: add method for delete_refs

2016-02-05 Thread David Turner
In the file-based backend, delete_refs has some special optimization to deal with packed refs. In other backends, we might be able to make ref deletion faster by putting all deletions into a single transaction. So we need a special backend function for this. Signed-off-by: David Turner --- ref

[PATCH v4 04/21] refs: add do_for_each_per_worktree_ref

2016-02-05 Thread David Turner
Alternate refs backends might still use files to store per-worktree refs. So the files backend's ref-loading infrastructure should be available to those backends, just for use on per-worktree refs. Add do_for_each_per_worktree_ref, which iterates over per-worktree refs. Signed-off-by: David Turn

[PATCH v4 18/21] svn: learn ref-storage argument

2016-02-05 Thread David Turner
git svn learns to pass the ref-storage command-line argument (to init and clone) through to git init. Signed-off-by: David Turner Signed-off-by: SZEDER Gábor --- contrib/completion/git-completion.bash | 2 +- git-svn.perl | 6 +- 2 files changed, 6 insertions(+), 2

[PATCH v4 16/21] refs: check submodules ref storage config

2016-02-05 Thread David Turner
All submodules must have the same ref storage (for now). Confirm that this is so before attempting to do anything with submodule refs. Signed-off-by: David Turner --- refs.c | 56 refs/files-backend.c | 8 ++-- 2 files chan

[PATCH v4 20/21] refs: add LMDB refs storage backend

2016-02-05 Thread David Turner
Add a database backend for refs using LMDB. This backend runs git for-each-ref about 30% faster than the files backend with fully-packed refs on a repo with ~120k refs. It's also about 4x faster than using fully-unpacked refs. In addition, and perhaps more importantly, it avoids case-conflict is

[PATCH v4 19/21] refs: add register_ref_storage_backends()

2016-02-05 Thread David Turner
This new function will register all known ref storage backends... once there are any other than the default. For now, it's a no-op. Signed-off-by: David Turner --- builtin/init-db.c | 3 +++ config.c | 25 + refs.c| 8 refs.h|

[PATCH v4 11/21] refs: move duplicate check to common code

2016-02-05 Thread David Turner
The check for duplicate refnames in a transaction is needed for all backends, so move it to the common code. ref_transaction_commit_fn gains a new argument, the sorted string_list of affected refnames. Signed-off-by: David Turner --- refs.c | 69 +++

[PATCH v4 17/21] clone: allow ref storage backend to be set for clone

2016-02-05 Thread David Turner
Add a new option, --ref-storage, to allow the ref storage backend to be set on new clones. Submodules must use the same ref storage as the parent repository, so we also pass the --ref-storage option option when cloning submodules. Signed-off-by: David Turner Signed-off-by: SZEDER Gábor --- Doc

[PATCH v4 10/21] refs: make lock generic

2016-02-05 Thread David Turner
Instead of using a files-backend-specific struct ref_lock, the generic ref_transaction struct should provide a void pointer that backends can use for their own lock data. Signed-off-by: David Turner --- refs/files-backend.c | 29 - refs/refs-internal.h | 2 +- 2 file

[PATCH v4 09/21] refs: add method to rename refs

2016-02-05 Thread David Turner
Signed-off-by: David Turner --- refs.c | 5 + refs/files-backend.c | 4 +++- refs/refs-internal.h | 9 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 7758bdc..e04fddc 100644 --- a/refs.c +++ b/refs.c @@ -1133,6 +1133,11 @@ int dele

[PATCH v4 02/21] refs: add methods for misc ref operations

2016-02-05 Thread David Turner
From: Ronnie Sahlberg Add ref backend methods for: resolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref, create_symref, resolve_gitlink_ref. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- builtin/init-db.c| 1 + refs.c | 36 +

[PATCH v4 06/21] refs: add method for initial ref transaction commit

2016-02-05 Thread David Turner
Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 6 ++ refs/files-backend.c | 5 +++-- refs/refs-internal.h | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index 3254378..d481a94 100644 --- a/refs.c +++ b/refs.c @@ -

[PATCH v4 05/21] refs: add methods for reflog

2016-02-05 Thread David Turner
In the file-based backend, the reflog piggybacks on the ref lock. Since other backends won't have the same sort of ref lock, ref backends must also handle reflogs. Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 46 ++

[PATCH v4 01/21] refs: add a backend method structure with transaction functions

2016-02-05 Thread David Turner
From: Ronnie Sahlberg Add a ref structure for storage backend methods. Start by adding a method pointer for the transaction commit function. Add a function set_refs_backend to switch between storage backends. The files based storage backend is the default. Signed-off-by: Ronnie Sahlberg Signed

[PATCH v4 03/21] refs: add methods for the ref iterators

2016-02-05 Thread David Turner
From: Ronnie Sahlberg Signed-off-by: Ronnie Sahlberg Signed-off-by: David Turner --- refs.c | 54 refs/files-backend.c | 41 +++ refs/refs-internal.h | 29 3 file

[PATCH v4 13/21] refs: resolve symbolic refs first

2016-02-05 Thread David Turner
Before committing ref updates, split symbolic ref updates into two parts: an update to the underlying ref, and a log-only update to the symbolic ref. This ensures that both references are locked correctly while their reflogs are updated. It is still possible to confuse git by concurrent updates,

[PATCH v4 08/21] refs: add methods to init refs db

2016-02-05 Thread David Turner
Alternate refs backends might not need the refs/heads directory and so on, so we make ref db initialization part of the backend. Signed-off-by: David Turner --- builtin/init-db.c| 20 ++-- refs.c | 5 + refs.h | 2 ++ refs/files-backend.c | 1

[PATCH v4 12/21] refs: allow log-only updates

2016-02-05 Thread David Turner
The refs infrastructure learns about log-only ref updates, which only update the reflog. Later, we will use this to separate symbolic reference resolution from ref updating. Signed-off-by: David Turner --- refs/files-backend.c | 15 ++- refs/refs-internal.h | 2 ++ 2 files changed,

[PATCH v4 14/21] refs: always handle non-normal refs in files backend

2016-02-05 Thread David Turner
Always handle non-normal (per-worktree or pseudo) refs in the files backend instead of alternate backends. Sometimes a ref transaction will update both a per-worktree ref and a normal ref. For instance, an ordinary commit might update refs/heads/master and HEAD (or at least HEAD's reflog). Updat

[PATCH v4 00/20] refs backend

2016-02-05 Thread David Turner
Changes to this version: re-rolled on top of pu as-of 9db66d9f1aa. Bug fixes include: For submodules: memory leaks; segfault on bad config. (thanks to Peff) In symref splitting: check that would always succeed (thanks to Peff) A bogus double-declaration of a var (thanks to Ramsay Jones) Two memory

Re: Clarification on the git+ssh and ssh+git schemes

2016-02-05 Thread Linus Torvalds
On Fri, Feb 5, 2016 at 11:30 AM, Jeff King wrote: > > I suspect they were not really documented because nobody wanted to > encourage their use. I don't think it would be wrong to document that > they exist and are deprecated, though. They exist because some people seemed to think that people shou

Re: [PATCH v6 2/3] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Junio C Hamano
Dan Aloni writes: > +user.useConfigOnly:: > + This instruct Git to avoid trying to guess defaults for 'user.email' > + and 'user.name' other than strictly from environment or config. OK. > + If you have multiple email addresses that you would like to set > + up per repository, y

Re: [PATCH v6 2/3] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Eric Sunshine
On Fri, Feb 5, 2016 at 2:18 PM, Jeff King wrote: > On Fri, Feb 05, 2016 at 09:42:27AM +0200, Dan Aloni wrote: >> +prepare () { >> + # Have a non-empty repository >> + rm -fr .git >> + git init >> + echo "Initial" >foo && >> + git add foo && >> + git commit -m foo && >> + >>

Re: Clarification on the git+ssh and ssh+git schemes

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 09:33:06AM -0800, Carlos Martín Nieto wrote: > git supports using git+ssh:// and ssh+git:// instead of ssh:// or the > rsync-style format. The first two are however not documented in the > git-clone manage as acceptable protocols (which is what I think of as > the canonical

Re: [PATCH v6 3/3] ident: cleanup wrt ident's source

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 11:05:19AM -0800, Junio C Hamano wrote: > Dan Aloni writes: > > > This change condenses the variables that tells where we got the user's > > ident into single enum, instead of a collection of booleans. > > > > In addtion, also have {committer,author}_ident_sufficiently_gi

Re: [PATCH v6 2/3] ident: add user.useConfigOnly boolean for when ident shouldn't be guessed

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 09:42:27AM +0200, Dan Aloni wrote: > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 02bcde6bb596..25cf7ce4e83a 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -2821,6 +2821,15 @@ user.name:: > Can be overridden b

Re: changing colors in the tree view in gitk

2016-02-05 Thread Philip Oakley
From: "Britton Kerin" I upgraded from 2.5 to 2.7 and the branch names went from a light green to dark green, the names of the tags are hard to read now. Is it possible to configure the branch name color in the tree view? -- Which Operating System is this on? and which Git version.? For the G

Re: [PATCH v6 3/3] ident: cleanup wrt ident's source

2016-02-05 Thread Junio C Hamano
Dan Aloni writes: > This change condenses the variables that tells where we got the user's > ident into single enum, instead of a collection of booleans. > > In addtion, also have {committer,author}_ident_sufficiently_given > directly probe the environment and the afformentioned enum instead of >

Re: [PATCHv8 6/9] fetching submodules: respect `submodule.fetchJobs` config option

2016-02-05 Thread Stefan Beller
On Thu, Feb 4, 2016 at 7:29 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> diff --git a/builtin/fetch.c b/builtin/fetch.c >> index 586840d..5aa1c2d 100644 >> --- a/builtin/fetch.c >> +++ b/builtin/fetch.c >> @@ -37,7 +37,7 @@ static int prune = -1; /* unspecified */ >> static int all, ap

Re: [PATCH 2/8] pack-objects: produce a stable pack when --skip is given

2016-02-05 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > index 417c830..c58a9cb 100644 > --- a/builtin/pack-objects.c > +++ b/builtin/pack-objects.c > @@ -2709,6 +2709,11 @@ int cmd_pack_objects(int argc, const char **argv, > const char *prefix) >

Re: [PATCH] remote-curl: don't fall back to Basic auth if we haven't tried Negotiate

2016-02-05 Thread Junio C Hamano
Dmitry Vilkov writes: > 2016-02-03 2:29 GMT+03:00 brian m. carlson : >> I'm unclear in what case you'd need to have a username and password >> combination with GSS-Negotiate. Kerberos doesn't use your password, >> although you need some indication of a username (valid or not) to get >> libcurl t

Clarification on the git+ssh and ssh+git schemes

2016-02-05 Thread Carlos Martín Nieto
Hello gits, git supports using git+ssh:// and ssh+git:// instead of ssh:// or the rsync-style format. The first two are however not documented in the git-clone manage as acceptable protocols (which is what I think of as the canonical source for what you can use). There are tests to make sure th

changing colors in the tree view in gitk

2016-02-05 Thread Britton Kerin
I upgraded from 2.5 to 2.7 and the branch names went from a light green to dark green, the names of the tags are hard to read now. Is it possible to configure the branch name color in the tree view? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to major

gitk view documentation? tooltips?

2016-02-05 Thread Britton Kerin
I guess I found the view documentation in git-log and git-rev-list man pages For some reason my brain also slightly resists permanently learning what some of the arrows, search, find fields etc at the top level do. Might tooltips for all this stuff be helpful? -- To unsubscribe from this list: se

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

2016-02-05 Thread tboegi
From: Torsten Bögershausen When core.autocrlf is set to false, and no attributes are set, the file is treated as binary. Simplify the logic and remove duplicated code when dealing with (crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE) by setting crlf_action=CRLF_BINARY already in conver

[PATCH v3 4/7] convert.c: use text_eol_is_crlf()

2016-02-05 Thread tboegi
From: Torsten Bögershausen Add a helper function to find out, which line endings text files should get at checkout, depending on core.autocrlf and core.eol Signed-off-by: Torsten Bögershausen --- convert.c | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) diff --git

[PATCH v3 2/7] convert.c: remove unused parameter 'path'

2016-02-05 Thread tboegi
From: Torsten Bögershausen Some functions get a parameter path, but don't use it. Remove the unused parameter. Signed-off-by: Torsten Bögershausen --- convert.c | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/convert.c b/convert.c index 4bb4ec1..a24c2a2

  1   2   >