Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Duy Nguyen
On Fri, Dec 14, 2018 at 7:50 AM Jacob Keller wrote: > > On Thu, Dec 13, 2018 at 1:16 PM Mike Rappazzo wrote: > > > > On Thu, Dec 13, 2018 at 3:48 PM Stefan Beller wrote: > > > > > > > > The current situation is definitely a problem. If I am in a worktree, > > > > > using "head" should be the sa

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Jacob Keller
On Thu, Dec 13, 2018 at 1:16 PM Mike Rappazzo wrote: > > On Thu, Dec 13, 2018 at 3:48 PM Stefan Beller wrote: > > > > > > The current situation is definitely a problem. If I am in a worktree, > > > > using "head" should be the same as "HEAD". > > > > By any chance, is your file system case insen

Re: [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

2018-12-13 Thread Yaroslav O Halchenko
On Thu, 13 Dec 2018, Stefan Beller wrote: > > cool, thanks for the feedback - I will then try to make it happen > > quick one (so when I get to it I know): should I replicate all those > > tests you have for other update strategies? (treating of config > > specifications etc) > If there is a

Re: [PATCH 0/4] Expose gpgsig in pretty-print

2018-12-13 Thread Michał Górny
On Thu, 2018-12-13 at 16:22 -0500, John Passaro wrote: > Currently, users who do not have GPG installed have no way to discern > signed from unsigned commits without examining raw commit data. I > propose two new pretty-print placeholders to expose this information: > > %GR: full ("R"aw) contents

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Junio C Hamano
Duy Nguyen writes: > If you make "head" work like "HEAD", then it should work for _all_ > commands, not just worktree, and "MASTER" should match > "refs/heads/master" and so on. I don't think it's as simple as > changing strcmp to strcasecmp. You would need to make ref management > case-insensiti

Re: [PATCH v3] revision: use commit graph in get_reference()

2018-12-13 Thread Junio C Hamano
Jonathan Tan writes: > When fetching into a repository, a connectivity check is first made by > check_exist_and_connected() in builtin/fetch.c that runs: > > git rev-list --objects --stdin --not --all --quiet <(list of objects) > > If the client repository has many refs, this command can be slo

Re: [Question] Complex textconv text

2018-12-13 Thread Junio C Hamano
"Randall S. Becker" writes: > Hi all, > > I have a strange situation and need help with resolving funky characters in > .git/config. My situation is this: > > [diff "*.dat"] > textconv = enscribe-conv > --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 > > Basically this i

Re: [PATCH] submodule update: run at most one fetch job unless otherwise set

2018-12-13 Thread Junio C Hamano
Stefan Beller writes: > From: Junio C Hamano > > In a028a1930c (fetching submodules: respect `submodule.fetchJobs` > config option, 2016-02-29), we made sure to keep the default behavior > of a fetching at most one submodule at once when not setting the > newly introduced `submodule.fetchJobs` c

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

2018-12-13 Thread Junio C Hamano
Duy Nguyen writes: > On Thu, Dec 13, 2018 at 7:08 PM Duy Nguyen wrote: >> There's also a bug in my patch (-2 is already being used by >> parse_opt_unknown_cb and my patch will change behavior of git-blame at >> least in theory). > > Ah no. Too many magic numbers in parse-options.c code. It's wor

Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-12-13 Thread Junio C Hamano
Sergey Organov writes: > I came up with the following as a preparatory change. Looks acceptable? > > -- 8< -- > > t3510: stop using '-m 1' to force failure mid-sequence of cherry-picks > > We are going to allow 'git cherry-pick -m 1' for non-merge commits, so > this method to for

Re: [PATCH v2 1/2] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread Junio C Hamano
Derrick Stolee writes: >> FWIW, I personally do not think "is sensitive to CRLF" is too bad, >> as my attempt to clarify it does not make it much better, e.g. >> >> The logic to read from these files in shell uses built-in >> "read" command, which leaves CR at the end of these text >>

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-13 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> +# Other protocol versions (e.g. 2) allow fetching an unadvertised >> +# object, so run this test with the default protocol version (0). >> +test_must_fail env GIT_TEST_PROTOCOL_VERSION= git -C client fetch-pack >> ../server \ >> $(git

Re: [PATCH 2/3] parse_hide_refs_config: handle NULL section

2018-12-13 Thread Junio C Hamano
Jeff King writes: > This helper function looks for config in two places: transfer.hiderefs, > or $section.hiderefs, where $section is passed in by the caller (and is > "uploadpack" or "receive", depending on the context). > > In preparation for callers which do not even have that context (namely

Re: [PATCH 1/3] serve: pass "config context" through to individual commands

2018-12-13 Thread Junio C Hamano
Jeff King writes: > In protocol v2, instead of just running "upload-pack", we have a generic > "serve" loop which runs command requests from the client. What used to > be "upload-pack" is now generally split into two operations: "ls-refs" > and "fetch". The latter knows it must respect uploadpack

Re: [PATCH v2 1/2] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread brian m. carlson
On Wed, Dec 12, 2018 at 10:14:53AM -0800, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The new test_oid machinery in the test library requires reading > some information from t/oid-info/hash-info and t/oid-info/oid. > The shell logic that reads from these files is sensitive t

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread brian m. carlson
On Thu, Dec 13, 2018 at 04:14:28PM -0500, Mike Rappazzo wrote: > On Thu, Dec 13, 2018 at 3:48 PM Stefan Beller wrote: > > > > > > The current situation is definitely a problem. If I am in a worktree, > > > > using "head" should be the same as "HEAD". > > > > By any chance, is your file system cas

Re: [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

2018-12-13 Thread Stefan Beller
On Thu, Dec 13, 2018 at 2:44 PM Yaroslav O Halchenko wrote: > > > On Thu, 13 Dec 2018, Stefan Beller wrote: > > > > and kaboom -- we have a new test. If we decide to test more -- just tune > > > up > > > test_expect_unchanged_submodule_status and done -- all the tests remain > > > sufficiently p

Re: [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

2018-12-13 Thread Yaroslav O Halchenko
On Thu, 13 Dec 2018, Stefan Beller wrote: > > and kaboom -- we have a new test. If we decide to test more -- just tune up > > test_expect_unchanged_submodule_status and done -- all the tests remain > > sufficiently prescribed. > > What do you think? > That is pretty cool. Maybe my gut reactio

Re: [PATCH v3 1/4] pack-protocol.txt: accept error packets in any context

2018-12-13 Thread Josh Steadmon
On 2018.12.12 17:17, Masaya Suzuki wrote: > On Wed, Dec 12, 2018 at 3:02 AM Jeff King wrote: > > This ERR handling has been moved to a very low level. What happens if > > we're passing arbitrary data via the packet_read() code? Could we > > erroneously trigger an error if a packfile happens to hav

Re: [wishlist] support of cloning recursively from non-bare submodule hierarchies?

2018-12-13 Thread Stefan Beller
On Thu, Dec 13, 2018 at 9:19 AM Yaroslav Halchenko wrote: > > Example - on http://datasets.datalad.org we have a few hundred datasets > organized into a hierarchy as git submodules. Each git submodules carries > its > own .git/ directory so they are "self sufficient" and we could readily assess

[PATCH 4/4] docs/pretty-formats: add explanation + copy edits

2018-12-13 Thread John Passaro
Clarify description of %G? = "U" to say it can mean good signature but untrusted key. Make wording consistent between %G* placeholders and other placeholders by removing the verb "show". Signed-off-by: John Passaro --- Documentation/pretty-formats.txt | 13 +++-- 1 file changed, 7 inser

[PATCH 3/4] doc, tests: pretty behavior when gpg missing

2018-12-13 Thread John Passaro
Test that when GPG cannot be run, new placeholders %GR and %G+ are unaffected, %G? always returns 'N', and other GPG-related placeholders return blank. As of e5a329a279 ("run-command: report exec failure" 2018-12-11), if GPG cannot be run and placeholders requiring GPG are given, git complains to

[PATCH 1/4] pretty: expose raw commit signature

2018-12-13 Thread John Passaro
Add new pretty-format placeholders %GR and %G+ to support inspecting gpgsig commit header in pretty format, even if GPG is not available. Signed-off-by: John Passaro --- Documentation/pretty-formats.txt | 2 ++ pretty.c | 36 ++-- 2 files chan

[PATCH 0/4] Expose gpgsig in pretty-print

2018-12-13 Thread John Passaro
Currently, users who do not have GPG installed have no way to discern signed from unsigned commits without examining raw commit data. I propose two new pretty-print placeholders to expose this information: %GR: full ("R"aw) contents of gpgsig header %G+: Y/N if the commit has nonempty gpgsig heade

[PATCH 2/4] t/t7510-signed-commit.sh: test new placeholders

2018-12-13 Thread John Passaro
Test that %GR output ("Raw" contents of "gpgsig" header) looks like ASCII-armored GPG signature. Test %G+ (Y/N for presence/absence of "gpgsig" header) by adding it to existing format tests for signed commits. Signed-off-by: John Passaro --- t/t7510-signed-commit.sh | 30 +++

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Mike Rappazzo
On Thu, Dec 13, 2018 at 3:48 PM Stefan Beller wrote: > > > > The current situation is definitely a problem. If I am in a worktree, > > > using "head" should be the same as "HEAD". > > By any chance, is your file system case insensitive? > That is usually the source of confusion for these discussi

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Mike Rappazzo
On Thu, Dec 13, 2018 at 3:43 PM Duy Nguyen wrote: > > On Thu, Dec 13, 2018 at 9:34 PM Mike Rappazzo wrote: > > > > On Thu, Dec 13, 2018 at 3:23 PM Duy Nguyen wrote: > > > > > > On Thu, Dec 13, 2018 at 8:56 PM Michael Rappazzo via GitGitGadget > > > wrote: > > > > > > > > From: Michael Rappazzo

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Stefan Beller
> > The current situation is definitely a problem. If I am in a worktree, > > using "head" should be the same as "HEAD". By any chance, is your file system case insensitive? That is usually the source of confusion for these discussions. Maybe in worktree code we have a spillover between path res

Re: [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

2018-12-13 Thread Stefan Beller
On Thu, Dec 13, 2018 at 8:42 AM Yaroslav O Halchenko wrote: > > Thank you Stefan for the review and please pardon my delay with the > reply, and sorry it got a bit too long by the end ;) > > On Wed, 12 Dec 2018, Stefan Beller wrote: > > Thanks for the patches. The first patch looks good to me! > >

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Duy Nguyen
On Thu, Dec 13, 2018 at 9:34 PM Mike Rappazzo wrote: > > On Thu, Dec 13, 2018 at 3:23 PM Duy Nguyen wrote: > > > > On Thu, Dec 13, 2018 at 8:56 PM Michael Rappazzo via GitGitGadget > > wrote: > > > > > > From: Michael Rappazzo > > > > > > On a worktree which is not the primary, using the symbol

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Mike Rappazzo
On Thu, Dec 13, 2018 at 3:23 PM Duy Nguyen wrote: > > On Thu, Dec 13, 2018 at 8:56 PM Michael Rappazzo via GitGitGadget > wrote: > > > > From: Michael Rappazzo > > > > On a worktree which is not the primary, using the symbolic-ref 'head' was > > incorrectly pointing to the main worktree's HEAD.

Re: [PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Duy Nguyen
On Thu, Dec 13, 2018 at 8:56 PM Michael Rappazzo via GitGitGadget wrote: > > From: Michael Rappazzo > > On a worktree which is not the primary, using the symbolic-ref 'head' was > incorrectly pointing to the main worktree's HEAD. The same was true for > any other case of the word 'Head'. > > Sig

[PATCH 1/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Michael Rappazzo via GitGitGadget
From: Michael Rappazzo On a worktree which is not the primary, using the symbolic-ref 'head' was incorrectly pointing to the main worktree's HEAD. The same was true for any other case of the word 'Head'. Signed-off-by: Michael Rappazzo --- refs.c | 8 t/t1415-worktr

[PATCH 0/1] worktree refs: fix case sensitivity for 'head'

2018-12-13 Thread Michael Rappazzo via GitGitGadget
On a worktree which is not the primary, using the symbolic-ref 'head' was incorrectly pointing to the main worktree's HEAD. The same was true for any other casing of the word 'Head'. Signed-off-by: Michael Rappazzo rappa...@gmail.com [rappa...@gmail.com] Michael Rappazzo (1): worktree refs: fix

Re: [PATCH 0/3] protocol v2 and hidden refs

2018-12-13 Thread Jonathan Tan
Just realized that I haven't replied to this yet... > - I'm a little worried this may happen again with future features. The > root cause is that "ls-refs" follows a different code path than the > ref advertisement for "upload-pack". So if we add any new config, > it needs to go both

Re: [PATCH v2 5/8] tests: add a special setup where for protocol.version

2018-12-13 Thread Jonathan Tan
Regarding the subject, I think you mean "add a special setup var", not "add a special setup where". > +GIT_TEST_PROTOCOL_VERSION=<'protocol.version' config value>, when set, > +runs the test suite with the given protocol.version. E.g. "0", "1" or > +"2". Can be set to the empty string within tests

[PATCH v4 3/3] Makefile: correct example fuzz build

2018-12-13 Thread Josh Steadmon
Signed-off-by: Josh Steadmon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6b72f37c29..bbcfc2bc9f 100644 --- a/Makefile +++ b/Makefile @@ -3104,7 +3104,7 @@ cover_db_html: cover_db # An example command to build against libFuzzer from L

[PATCH v4 1/3] commit-graph, fuzz: Add fuzzer for commit-graph

2018-12-13 Thread Josh Steadmon
Breaks load_commit_graph_one() into a new function, parse_commit_graph(). The latter function operates on arbitrary buffers, which makes it suitable as a fuzzing target. Since parse_commit_graph() is only called by load_commit_graph_one() (and the fuzzer described below), we omit error messages tha

[PATCH v4 2/3] commit-graph: fix buffer read-overflow

2018-12-13 Thread Josh Steadmon
fuzz-commit-graph identified a case where Git will read past the end of a buffer containing a commit graph if the graph's header has an incorrect chunk count. A simple bounds check in parse_commit_graph() prevents this. Signed-off-by: Josh Steadmon --- commit-graph.c | 14 --

[PATCH v4 0/3] Add commit-graph fuzzer and fix buffer overflow

2018-12-13 Thread Josh Steadmon
Add a new fuzz test for the commit graph and fix a buffer read-overflow that it discovered. Additionally, fix the Makefile instructions for building fuzzers. Changes since V3: * Improve portability of the new test functionality. * Fix broken &&-chains in tests. Changes since V2: * Avoid poi

[PATCH v2] teach git to support a virtual (partially populated) work directory

2018-12-13 Thread Ben Peart
From: Ben Peart To make git perform well on the very largest repos, we must make git operations O(modified) instead of O(size of repo). This takes advantage of the fact that the number of files a developer has modified (especially in very large repos) is typically a tiny fraction of the overall

Re: [PATCH 2/2] mingw: allow absolute paths without drive prefix

2018-12-13 Thread Johannes Sixt
Am 13.12.18 um 07:25 schrieb Johannes Sixt: Am 13.12.18 um 03:48 schrieb Junio C Hamano: So,... what's the conclusion?  The patch in the context of my tree would be a no-op, and we'd need a prerequisite change to the support function to accompany this patch to be effective? Correct, that is my

Re: enhancement: support for author.email and author.name in "git config"

2018-12-13 Thread Jonathan Nieder
William Hubbs wrote: > Is the git team on an irc channel somewhere, Some like to use #git-devel on freenode. > or should I start sending > patches that I know are incomplete to the list? Yeah, that's fine. Include [WIP/PATCH] in the subject line to

Re: enhancement: support for author.email and author.name in "git config"

2018-12-13 Thread William Hubbs
Hi Jonathan, On Fri, Dec 07, 2018 at 02:44:28PM -0800, Jonathan Nieder wrote: > William Hubbs wrote: > > On Thu, Dec 06, 2018 at 11:20:07PM +0100, Johannes Schindelin wrote: > > >> There *is* a way to get what you want that is super easy and will > >> definitely work: if you sit down and do it ;-

Re: Pre-commit hook does not work properly in recent version

2018-12-13 Thread Johannes Schindelin
Hi Andrew, On Thu, 13 Dec 2018, Andrew Kharchenko wrote: > I found a bug in Git v. 2.20.0 and 2.19.x at least, where pre-commit hook > does not work properly. > > OS: macOS High Sierra > Git: 2.20.0, 2.19.x > > Description: pre-commit file should be marked as executable in order to > recreate

Re: [PATCH] submodule update: run at most one fetch job unless otherwise set

2018-12-13 Thread Eric Sunshine
On Thu, Dec 13, 2018 at 2:03 PM Stefan Beller wrote: > In a028a1930c (fetching submodules: respect `submodule.fetchJobs` > config option, 2016-02-29), we made sure to keep the default behavior > of a fetching at most one submodule at once when not setting the s/of a/of/ > newly introduced `submo

[PATCH] submodule update: run at most one fetch job unless otherwise set

2018-12-13 Thread Stefan Beller
From: Junio C Hamano In a028a1930c (fetching submodules: respect `submodule.fetchJobs` config option, 2016-02-29), we made sure to keep the default behavior of a fetching at most one submodule at once when not setting the newly introduced `submodule.fetchJobs` config. This regressed in 90efe595c

[PATCH v3] revision: use commit graph in get_reference()

2018-12-13 Thread Jonathan Tan
When fetching into a repository, a connectivity check is first made by check_exist_and_connected() in builtin/fetch.c that runs: git rev-list --objects --stdin --not --all --quiet <(list of objects) If the client repository has many refs, this command can be slow, regardless of the nature of th

Re: 2.20.0 - Undocumented change in submodule update wrt # parallel jobs

2018-12-13 Thread Stefan Beller
On Thu, Dec 13, 2018 at 6:17 AM Junio C Hamano wrote: > > Sjon Hortensius writes: > > > When switching to 2.20 our `git submodule update' (which clones > > through ssh) broke because our ssh-server rejected the ~20 > > simultaneous connections the git-client makes. This seems to be caused > > by

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

2018-12-13 Thread Duy Nguyen
On Thu, Dec 13, 2018 at 7:08 PM Duy Nguyen wrote: > There's also a bug in my patch (-2 is already being used by > parse_opt_unknown_cb and my patch will change behavior of git-blame at > least in theory). Ah no. Too many magic numbers in parse-options.c code. It's working fine but I'll need to gi

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

2018-12-13 Thread Duy Nguyen
On Thu, Dec 13, 2018 at 3:05 PM Ævar Arnfjörð Bjarmason wrote: > > > On Thu, Dec 13 2018, Junio C Hamano wrote: > > > Here is an excerpt from a draft edition of "What's cooking" report > > for topics that are about an immediate 2.20.1 maintenance release, > > with five topics that I plan to merge

[PATCH] Simplify handling of setup_git_directory_gently() failure cases.

2018-12-13 Thread Erin Dahlgren
setup_git_directory_gently() expects two types of failures to discover a git directory (e.g. .git/): - GIT_DIR_HIT_CEILING: could not find a git directory in any parent directories of the cwd. - GIT_DIR_HIT_MOUNT_POINT: could not find a git directory in any parent directories u

[wishlist] support of cloning recursively from non-bare submodule hierarchies?

2018-12-13 Thread Yaroslav Halchenko
Example - on http://datasets.datalad.org we have a few hundred datasets organized into a hierarchy as git submodules. Each git submodules carries its own .git/ directory so they are "self sufficient" and we could readily assess their sizes, and "cut the tree" at any level without looking for the

Re: [PATCH] Re: [wishlist] submodule.update config

2018-12-13 Thread Yaroslav Halchenko
On Wed, 12 Dec 2018, Stefan Beller wrote: > > But again, I must confess, that either I forgot or just do not see a > > clear use-case/demand for submodule.update config myself any longer, > ok, let's drop that patch then. ok, But I will cherish it in my memory so whenever the use case comes ba

Re: [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule status --recursive to stay intact

2018-12-13 Thread Yaroslav O Halchenko
Thank you Stefan for the review and please pardon my delay with the reply, and sorry it got a bit too long by the end ;) On Wed, 12 Dec 2018, Stefan Beller wrote: > Thanks for the patches. The first patch looks good to me! Great! > > [PATCH 2/2] RF+ENH(TST): compare the entire list of submodule

Re: [PATCH v2 1/2] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread Derrick Stolee
On 12/12/2018 9:38 PM, Junio C Hamano wrote: "Derrick Stolee via GitGitGadget" writes: From: Derrick Stolee The new test_oid machinery in the test library requires reading some information from t/oid-info/hash-info and t/oid-info/oid. The shell logic that reads from these files is sensitive

Re: [PATCH on master v2] revision: use commit graph in get_reference()

2018-12-13 Thread Derrick Stolee
On 12/12/2018 8:27 PM, Jeff King wrote: On Wed, Dec 12, 2018 at 11:58:12AM -0800, Jonathan Tan wrote: Yeah, this was the part that took me a bit to figure out, as well. The optimization here is really just avoiding a call to lookup_commit(), which will do a single hash-table lookup. I wonder if

Re: [PATCHSET] git-reverse-trailer-xrefs: Reverse map cherry-picks and other cross-references

2018-12-13 Thread Tejun Heo
Hello, Junio. On Thu, Dec 13, 2018 at 02:47:36PM +0900, Junio C Hamano wrote: > Tejun Heo writes: > > > Hmmm... I see. I still have a bit of trouble seeing why doing it that > > way is better tho. Wouldn't new-object-hook be simpler? They'll > > achieve about the same thing but one would need

RE: [Question] Complex textconv text

2018-12-13 Thread Randall S. Becker
On December 13, 2018 10:08, I wrote: > I have a strange situation and need help with resolving funky characters in > .git/config. My situation is this: > > [diff "*.dat"] > textconv = enscribe-conv > --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 > > Basically this is

Re: [PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-13 Thread Ævar Arnfjörð Bjarmason
On Thu, Dec 13 2018, Ævar Arnfjörð Bjarmason wrote: Now that we have this maybe we should discuss why these tests show different things: > diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh > index 086f2c40f6..8b1217ea26 100755 > --- a/t/t5500-fetch-pack.sh > +++ b/t/t5500-fetch-pack.sh

[PATCH v2 6/8] tests: mark & fix tests broken under GIT_TEST_PROTOCOL_VERSION=1

2018-12-13 Thread Ævar Arnfjörð Bjarmason
There's one t5400-send-pack.sh test which is broken under GIT_TEST_PROTOCOL_VERSION=1. It's easier to just coerce it to run under protocol 1. The difference in the output is that there'll be a "version 1" line which'll make the subsequent "test_cmp". See protocol.version in git-config(1) which note

[PATCH v2 8/8] tests: mark tests broken under GIT_TEST_PROTOCOL_VERSION=2

2018-12-13 Thread Ævar Arnfjörð Bjarmason
Mark those tests that have behavior differences or bugs under protocol.version=2. Whether or not these tests should exhibit different behavior is outside the scope of this change. Some (such as t5500-fetch-pack.sh) are intentionally different, but others (such as t7406-submodule-update.sh and t551

[PATCH v2 4/8] tests: add a check for unportable env --unset

2018-12-13 Thread Ævar Arnfjörð Bjarmason
The "env --unset=*" argument isn't portable. Neither Solaris or AIX have it, and probably not a bunch of other POSIX-like OS's. Using this was suggested on-list[1]. Let's add a check for it so it doesn't sneak into the codebase in the future. 1. https://public-inbox.org/git/cover.1544573604.git.j

[PATCH v2 1/8] serve: pass "config context" through to individual commands

2018-12-13 Thread Ævar Arnfjörð Bjarmason
From: Jeff King In protocol v2, instead of just running "upload-pack", we have a generic "serve" loop which runs command requests from the client. What used to be "upload-pack" is now generally split into two operations: "ls-refs" and "fetch". The latter knows it must respect uploadpack.* config,

[PATCH v2 7/8] builtin/fetch-pack: support protocol version 2

2018-12-13 Thread Ævar Arnfjörð Bjarmason
From: Jonathan Tan Currently, if support for running Git's entire test suite with protocol v2 were added, some tests would fail because the fetch-pack CLI command dies if it encounters protocol v2. To avoid this, teach fetch-pack support for protocol v2. Signed-off-by: Jonathan Tan Signed-off-b

[PATCH v2 3/8] upload-pack: support hidden refs with protocol v2

2018-12-13 Thread Ævar Arnfjörð Bjarmason
From: Jeff King In the v2 protocol, upload-pack's advertisement has been moved to the "ls-refs" command. That command does not respect hidden-ref config (like transfer.hiderefs) at all, and advertises everything. While there are some features that are not supported in v2 (e.g., v2 always allows

[PATCH v2 0/8] protocol v2 fixes

2018-12-13 Thread Ævar Arnfjörð Bjarmason
I figured it would be easier for everyone if I rolled this all into one series instead of Junio & us needing to keep track of what's based on what. The only change I made to Jeff's patches is my SOB and adding a paragraph to the end of his 3/3 saying that the v2 push protocol doesn't have the same

[PATCH v2 2/8] parse_hide_refs_config: handle NULL section

2018-12-13 Thread Ævar Arnfjörð Bjarmason
From: Jeff King This helper function looks for config in two places: transfer.hiderefs, or $section.hiderefs, where $section is passed in by the caller (and is "uploadpack" or "receive", depending on the context). In preparation for callers which do not even have that context (namely the "git-se

[PATCH v2 5/8] tests: add a special setup where for protocol.version

2018-12-13 Thread Ævar Arnfjörð Bjarmason
Add a GIT_TEST_PROTOCOL_VERSION=X test mode which is equivalent to running with protocol.version=X. This is needed to spot regressions and differences such as "ls-refs" behaving differently with transfer.hideRefs. See https://public-inbox.org/git/20181211104236.ga6...@sigill.intra.peff.net/ for a f

Re: [PATCH] cherry-pick: do not error on non-merge commits when '-m 1' is specified

2018-12-13 Thread Sergey Organov
Sergey Organov writes: > Junio C Hamano writes: > >> Sergey Organov writes: >> [...] >> >> The change to the code itself looks sane, but applying this patch >> alone will break existing tests whose expectations must be updated, >> and this new behaviour must be protected by a new test (or two

[Question] Complex textconv text

2018-12-13 Thread Randall S. Becker
Hi all, I have a strange situation and need help with resolving funky characters in .git/config. My situation is this: [diff "*.dat"] textconv = enscribe-conv --format=-a1\(A=-a1,-a16,-a32\|P=-a1,-a32,-a16\|=-a1,-d,a14\),-a224 Basically this is a formatter for diff so that I can show str

Pre-commit hook does not work properly in recent version

2018-12-13 Thread Andrew Kharchenko
Hello, I found a bug in Git v. 2.20.0 and 2.19.x at least, where pre-commit hook does not work properly. OS: macOS High Sierra Git: 2.20.0, 2.19.x Description: pre-commit file should be marked as executable in order to recreate the bug. When executing “git commit”, it silently exits without an

credit

2018-12-13 Thread Funding Trusts Finance
-- Hallo     Groeten van Funding Trusts Finance, we zijn gevestigde en goedgekeurde Britse leningmaatschappijen, door de jaren heen hebben we een goed begrip ontwikkeld van uw behoeften en individuele behoeften. we hebben ons gecommitteerd om onze klanten eerlijk te behandelen en een servi

Re: 2.20.0 - Undocumented change in submodule update wrt # parallel jobs

2018-12-13 Thread Junio C Hamano
Sjon Hortensius writes: > When switching to 2.20 our `git submodule update' (which clones > through ssh) broke because our ssh-server rejected the ~20 > simultaneous connections the git-client makes. This seems to be caused > by a (possibly unintended) change in > https://github.com/git/git/commi

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

2018-12-13 Thread Ævar Arnfjörð Bjarmason
On Thu, Dec 13 2018, Junio C Hamano wrote: > Here is an excerpt from a draft edition of "What's cooking" report > for topics that are about an immediate 2.20.1 maintenance release, > with five topics that I plan to merge to 'next' and then to 'maint' > soonish (they're all marked as "Will merge

[PATCH v2 0/1] Fix regression in t9902 with NO_PERL

2018-12-13 Thread Johannes Schindelin via GitGitGadget
The oneline notwithstanding, 13374987dd (completion: use _gitcompbuiltin for format-patch, 2018-11-03) changed also the way send-email options are completed, by asking the git send-email command itself what options it offers. Necessarily, this must fail when built with NO_PERL because send-email

[PATCH v2 1/1] t9902: 'send-email' test case requires PERL

2018-12-13 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The oneline notwithstanding, 13374987dd (completion: use _gitcompbuiltin for format-patch, 2018-11-03) changed also the way send-email options are completed, by asking the git send-email command itself what options it offers. Necessarily, this must fail when built with

Re: 2.20.0 - Undocumented change in submodule update wrt # parallel jobs

2018-12-13 Thread Ævar Arnfjörð Bjarmason
On Thu, Dec 13 2018, Sjon Hortensius wrote: > When switching to 2.20 our `git submodule update' (which clones > through ssh) broke because our ssh-server rejected the ~20 > simultaneous connections the git-client makes. This seems to be caused > by a (possibly unintended) change in > https://git

Re: [PATCH 0/1] Fix regression in t9902 with NO_PERL

2018-12-13 Thread Johannes Schindelin
Hi Gábor, On Thu, 13 Dec 2018, SZEDER Gábor wrote: > On Thu, Dec 13, 2018 at 05:01:11AM -0800, Johannes Schindelin via > GitGitGadget wrote: > > The oneline notwithstanding,13374987dd (completion: use > > _gitcompbuiltin for format-patch, 2018-11-03) changed also the way > > send-email options a

Re: [RFC/PATCH] Use mailmap by default in log, show and whatchanged

2018-12-13 Thread Johannes Schindelin
Hi CB, On Thu, 13 Dec 2018, CB Bailey wrote: > From: CB Bailey > > People who have changed their name or email address will usually know > that they need to set 'log.mailmap' in order to have their new details > reflected for old commits with 'git log', but others who interact with > them may n

Re: [PATCH 1/1] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread Johannes Schindelin
Hi Gábor, On Thu, 13 Dec 2018, SZEDER Gábor wrote: > On Thu, Dec 13, 2018 at 02:01:15PM +0100, Johannes Schindelin wrote: > > > > On Wed, 12 Dec 2018, SZEDER Gábor wrote: > > > > > On Tue, Dec 11, 2018 at 12:35:46PM -0800, Derrick Stolee via GitGitGadget > > > wrote: > > > > From: Derrick Stol

Re: [PATCH 0/1] Fix regression in t9902 with NO_PERL

2018-12-13 Thread SZEDER Gábor
On Thu, Dec 13, 2018 at 05:01:11AM -0800, Johannes Schindelin via GitGitGadget wrote: > The oneline notwithstanding,13374987dd (completion: use _gitcompbuiltin for > format-patch, 2018-11-03) changed also the way send-email options are > completed, by asking the git send-email command itself what

Re: [PATCH 1/1] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread SZEDER Gábor
On Thu, Dec 13, 2018 at 02:01:15PM +0100, Johannes Schindelin wrote: > Hi Gábor, > > On Wed, 12 Dec 2018, SZEDER Gábor wrote: > > > On Tue, Dec 11, 2018 at 12:35:46PM -0800, Derrick Stolee via GitGitGadget > > wrote: > > > From: Derrick Stolee > > > > > > The new test_oid machinery in the test

Re: [PATCH v2 1/3] http: add support for selecting SSL backends at runtime

2018-12-13 Thread Johannes Schindelin
Hi, On Thu, 13 Dec 2018, Johannes Schindelin wrote: > On Thu, 13 Dec 2018, Ævar Arnfjörð Bjarmason wrote: > > > On Thu, Oct 25 2018, Johannes Schindelin via GitGitGadget wrote: > > > > > From: Johannes Schindelin > > > > > > As of version 7.56.0, curl supports being compiled with multiple SSL

Re: [PATCH v2 1/3] http: add support for selecting SSL backends at runtime

2018-12-13 Thread Johannes Schindelin
Hi Ævar, On Thu, 13 Dec 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Oct 25 2018, Johannes Schindelin via GitGitGadget wrote: > > > From: Johannes Schindelin > > > > As of version 7.56.0, curl supports being compiled with multiple SSL > > backends. > > > > This patch adds the Git side of that

Re: [PATCH 1/1] .gitattributes: ensure t/oid-info/* has eol=lf

2018-12-13 Thread Johannes Schindelin
Hi Gábor, On Wed, 12 Dec 2018, SZEDER Gábor wrote: > On Tue, Dec 11, 2018 at 12:35:46PM -0800, Derrick Stolee via GitGitGadget > wrote: > > From: Derrick Stolee > > > > The new test_oid machinery in the test library requires reading > > some information from t/oid-info/hash-info and t/oid-info

[PATCH 1/1] t9902: 'send-email' test case requires PERL

2018-12-13 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin With NO_PERL, the `git send-email` script errors out with code 128, mentioning that Git was built without Perl support. Therefore, when the completion tries to ask for possible completions via `git send-email --git-completion-helper`, it won't provide what is necessary

[PATCH 0/1] Fix regression in t9902 with NO_PERL

2018-12-13 Thread Johannes Schindelin via GitGitGadget
The oneline notwithstanding,13374987dd (completion: use _gitcompbuiltin for format-patch, 2018-11-03) changed also the way send-email options are completed, by asking the git send-email command itself what options it offers. Necessarily, this must fail when built with NO_PERL because send-email i

Re: Preparing for 2.20.1 brown-paper-bag maintenance release

2018-12-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Dec 2018, Junio C Hamano wrote: > * ds/hash-independent-tests-fix (2018-12-12) 1 commit > - .gitattributes: ensure t/oid-info/* has eol=lf > > Test portability fix. > > [...] > > * js/mailinfo-format-flowed-fix (2018-12-13) 1 commit > - t4256: mark support files as LF-onl

F

2018-12-13 Thread Abrar Khan
Fx Sent from my iPhone

Re: [RFC/PATCH] Use mailmap by default in log, show and whatchanged

2018-12-13 Thread CB Bailey
On Thu, Dec 13, 2018 at 12:09:40PM +, CB Bailey wrote: > I had a dig around in the mailing list archives and couldn't find any > specific reason not to use a mailmap in log where one is in use. I did > find this message which suggests that it makes sense to make it the > default for human-consu

[RFC/PATCH] Use mailmap by default in log, show and whatchanged

2018-12-13 Thread CB Bailey
From: CB Bailey People who have changed their name or email address will usually know that they need to set 'log.mailmap' in order to have their new details reflected for old commits with 'git log', but others who interact with them may not know or care enough to enable this option. Change the d

Re: [PATCH v2] run-command: report exec failure

2018-12-13 Thread Johannes Schindelin
Hi Junio, On Thu, 13 Dec 2018, Junio C Hamano wrote: >I am taking that https://travis-ci.org/git/git/jobs/466908193 >that succeeded on Windows as a sign that this is now OK there. I concur, Dscho

Re: [PATCH v2 1/3] http: add support for selecting SSL backends at runtime

2018-12-13 Thread Ævar Arnfjörð Bjarmason
On Thu, Oct 25 2018, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > As of version 7.56.0, curl supports being compiled with multiple SSL > backends. > > This patch adds the Git side of that feature: by setting http.sslBackend > to "openssl" or "schannel", Git for Wi

2.20.0 - Undocumented change in submodule update wrt # parallel jobs

2018-12-13 Thread Sjon Hortensius
When switching to 2.20 our `git submodule update' (which clones through ssh) broke because our ssh-server rejected the ~20 simultaneous connections the git-client makes. This seems to be caused by a (possibly unintended) change in https://github.com/git/git/commit/90efe595c53f4bb1851371344c35eff71f

Re: [PATCH v2] run-command: report exec failure

2018-12-13 Thread Junio C Hamano
Jeff King writes: > On Thu, Dec 13, 2018 at 03:36:53AM +0900, Junio C Hamano wrote: > >> test_expect_success 'start_command reports ENOENT (slash)' ' >> -test-tool run-command start-command-ENOENT ./does-not-exist >> +test-tool run-command start-command-ENOENT ./does-not-exist 2>err && >

Re: [PATCH] run-command: report exec failure

2018-12-13 Thread Jeff King
On Wed, Dec 12, 2018 at 10:27:40AM -0500, John Passaro wrote: > Thank you for this incredibly quick fix. > > I see the fix made it to pu as 6b206be3e5 ("run-command: report exec > failure" 2018-12-11). For what it's worth, it fixes the issue as far > as I'm concerned and I'm very glad to see the

Re: [PATCH v2] run-command: report exec failure

2018-12-13 Thread Jeff King
On Thu, Dec 13, 2018 at 03:36:53AM +0900, Junio C Hamano wrote: > In 321fd823 ("run-command: mark path lookup errors with ENOENT", > 2018-10-24), we rewrote the logic to execute a command by looking > in the directories on $PATH; as a side effect, a request to run a > command that is not found on

Re: [PATCH v3 1/4] pack-protocol.txt: accept error packets in any context

2018-12-13 Thread Jeff King
On Wed, Dec 12, 2018 at 05:17:01PM -0800, Masaya Suzuki wrote: > > This is a change in the spec with an accompanying change in the code, > > which raises the question: what do other implementations do with this > > change (both older Git, and implementations like JGit, libgit2, etc)? > > JGit is