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

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

[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

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

[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

[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

[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

[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

[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

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 v3 7/7] convert.c: simplify text_stat

2016-02-05 Thread tboegi
From: Torsten Bögershausen Simplify the statistics: lonecr counts the CR which is not followed by a LF, lonelf counts the LF which is not preceded by a CR, crlf counts CRLF combinations. This simplifies the evaluation of the statistics. Signed-off-by: Torsten Bögershausen

[PATCH v3 1/7] t0027: Add tests for get_stream_filter()

2016-02-05 Thread tboegi
From: Torsten Bögershausen When a filter is configured, a different code-path is used in convert.c and entry.c via get_stream_filter(), but there are no test cases yet. Add tests for the filter API by configuring the ident filter. The result of the SHA1 conversion is not checked,

[PATCH v3 6/7] convert.c: refactor crlf_action

2016-02-05 Thread tboegi
From: Torsten Bögershausen Refactor the determination and usage of crlf_action. Today, when no attributes are set on a file, crlf_action is set to CRLF_GUESS, and later, CRLF_GUESS is used as an indication that core.autocrlf is not false and that some automatic eol conversion is

[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

[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

[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

[PATCH v3 3/7] convert.c: Remove input_crlf_action()

2016-02-05 Thread tboegi
From: Torsten Bögershausen Integrate the code of input_crlf_action() into convert_attrs(), so that ca.crlf_action is always valid after calling convert_attrs(). Keep a copy of crlf_action in attr_action, this is needed for get_convert_attr_ascii(). Remove eol_attr from struct

git clean without ignored files

2016-02-05 Thread Robert Dailey
I noticed that `git clean` does not handle a specific scenario. I have the following types of untracked entities in my working copy: * Untracked files in tracked directories (non-recursive; sibling files are tracked) * Untracked files in untracked directories (recursive) * Ignored files meeting

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:

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

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

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

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

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

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

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;

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

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

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

[PATCH v1] config: add '--sources' option to print the source of a config value

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

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

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

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 > +

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

[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

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

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

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: [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

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 >> @@

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

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 > > +++

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

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. >>

[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

[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

[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

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

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

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,

[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

[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

[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

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

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

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

[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 @@

[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 ---

[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

[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

[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

[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:

[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

[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).

[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 ++-

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 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

[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

[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

[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 |

[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

[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

[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 -

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

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: 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

[PATCH 1/8] pack-objects: add --skip and --skip-hash

2016-02-05 Thread Nguyễn Thái Ngọc Duy
The idea is, a pack is requested the first time with --skip=0. If pack transfer is interrupted, the client will ask for the same pack again, but this time it asks the server not to send what it already has. The client hashes what it has and sends the SHA-1 to the server. If the server finds out

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

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Parallel delta search does not produce a stable pack so it's disabled when --skip is used. zlib compression algorithm is stable. Ref negotiation should be stable (at least on smart http). Ref changes will be addressed separately. So unless configuration files or git binary is changed, we should

[PATCH 3/8] index-pack: add --append-pack=

2016-02-05 Thread Nguyễn Thái Ngọc Duy
In this mode (--append-pack --stdin), index-pack consumes current content in first without producing anything else, then continues to read from stdin and append to . This is the consumer end of "pack-objects --skip". Signed-off-by: Nguyễn Thái Ngọc Duy ---

[PATCH 8/8] one ugly test to verify basic functionality

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5544-fetch-resume.sh (new +x) | 42 1 file changed, 42 insertions(+) create mode 100755 t/t5544-fetch-resume.sh diff --git a/t/t5544-fetch-resume.sh b/t/t5544-fetch-resume.sh new file mode

[PATCH 6/8] fetch: add --resume-pack=

2016-02-05 Thread Nguyễn Thái Ngọc Duy
This is a low-level option for resumable fetch. You start a resumable fetch with git fetch --resume-pack=blah where "blah" file does not exist. If the fetch is interrupted, "blah" will contain what's been fetched so far. Run the same command again. On the server side, pack-objects performs

[PATCH 5/8] fetch-pack.c: send "skip" line to pack-objects

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- fetch-pack.c | 40 fetch-pack.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/fetch-pack.c b/fetch-pack.c index 01e34b6..ffb5254 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -15,6

[PATCH 7/8] index-pack: --append-pack implies --strict

2016-02-05 Thread Nguyễn Thái Ngọc Duy
A frankenstein pack, generated by multiple pack-objects runs, certainly has higher risk of broken, especially when the server side could be some other implementation than pack-objects. Be safe and strict. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/index-pack.c | 2 ++ 1

[PATCH 4/8] upload-pack: new capability to pass --skip* to pack-objects

2016-02-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/technical/pack-protocol.txt | 2 ++ Documentation/technical/protocol-capabilities.txt | 9 +++ upload-pack.c | 30 +-- 3 files changed, 39 insertions(+),

Re: [PATCH 4/8] upload-pack: new capability to pass --skip* to pack-objects

2016-02-05 Thread Johannes Schindelin
Hi Duy, On Fri, 5 Feb 2016, Nguyễn Thái Ngọc Duy wrote: > [... empty commit message body...] > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > > [...] > diff --git a/Documentation/technical/protocol-capabilities.txt > b/Documentation/technical/protocol-capabilities.txt > index

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

2016-02-05 Thread Dmitry Vilkov
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

Re: [PATCH 1/8] pack-objects: add --skip and --skip-hash

2016-02-05 Thread Johannes Schindelin
Hi Duy, On Fri, 5 Feb 2016, Nguyễn Thái Ngọc Duy wrote: > The idea is, a pack is requested the first time with --skip=0. If pack > transfer is interrupted, the client will ask for the same pack again, > but this time it asks the server not to send what it already has. The > client hashes what it

Quick Loan Approval

2016-02-05 Thread Hijab Loan Firm
We can help you with a genuine loan to meet your needs. Do you need a personal or business loan without stress and quick approval? Do you need an urgent loan today? No Credit Checks * LOAN APPROVAL IN 60MINS !! * GUARANTEED SAME DAY TRANSFER !! * 100% APPROVAL RATE !! * LOW INTEREST RATE !!

Re: [PATCH v1] config: add '--sources' option to print the source of a config value

2016-02-05 Thread Sebastian Schuberth
On 2/5/2016 9:42, larsxschnei...@gmail.com wrote: Teach 'git config' the '--sources' option to print the source configuration file for every printed value. Yay, not being able to see where a config setting originates from has bothered me in the past, too. So thanks for working on this.

Re: [PATCH v1] config: add '--sources' option to print the source of a config value

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 12:13:04PM +0100, Sebastian Schuberth wrote: > On 2/5/2016 9:42, larsxschnei...@gmail.com wrote: > > >Teach 'git config' the '--sources' option to print the source > >configuration file for every printed value. > > Yay, not being able to see where a config setting

Re: [PATCH 8/8] one ugly test to verify basic functionality

2016-02-05 Thread Elia Pinto
2016-02-05 9:57 GMT+01:00 Nguyễn Thái Ngọc Duy : > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > t/t5544-fetch-resume.sh (new +x) | 42 > > 1 file changed, 42 insertions(+) > create mode 100755 t/t5544-fetch-resume.sh

Re: [PATCH 14/15] git-am.sh: replace using expr for arithmetic operations with the equivalent shell builtin

2016-02-05 Thread Elia Pinto
2016-02-04 20:33 GMT+01:00 Junio C Hamano : > As pointed out already, quoting of "$this" inside the arithmetic > expansion would not work very well, so [14/15] needs fixing. > > I do not see 01/15 thru 13/15 here, by the way. Is it just me? Excuse me, everyone. Yesterday was a

Re: [PATCH v1] config: add '--sources' option to print the source of a config value

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 09:42:30AM +0100, larsxschnei...@gmail.com wrote: > @@ -538,6 +569,17 @@ int cmd_config(int argc, const char **argv, const char > *prefix) > error("--name-only is only applicable to --list or > --get-regexp"); >

[BUG] git describe number of commits different from git log count

2016-02-05 Thread Jan Hudec
Hello, I have a repository with following situation: $ git describe next v4.1-2196-g5a414d7 $ git describe next --match=v4.2 v4.2-4757-g5a414d7 Since the tag with fewest commits since is selected, it appears logical. However, v4.2 is descendant of v4.1, so it does not make

Re: [PATCH v1] config: add '--sources' option to print the source of a config value

2016-02-05 Thread Sebastian Schuberth
On 2/5/2016 12:20, Jeff King wrote: Hmm. I had originally envisioned this only being used with "--list", but I guess it makes sense to say "--sources --get" to show where the value for a particular option is coming from. Being able to use "--sources --get" is a feature that I'd definitely

酷帅型系扣牛仔裤

2016-02-05 Thread 酷帅型系扣牛仔裤
你的老朋友邀你来Q群:343257759

Re: [PATCH v1] config: add '--sources' option to print the source of a config value

2016-02-05 Thread Jeff King
On Fri, Feb 05, 2016 at 12:31:15PM +0100, Sebastian Schuberth wrote: > >I'm not sure returning here is the best idea. We won't have a config > >filename if we are reading from "-c", but if we return early from this > >function, it parses differently than every other line. E.g., with your >

  1   2   >