Re: [PATCH] grep: skip UTF8 checks explicitly

2019-07-23 Thread Junio C Hamano
Carlo Marcelo Arenas Belón writes: > Usually PCRE is compiled with JIT support, and therefore the code > path used includes calling pcre2_jit_match (for PCRE2), that ignores > invalid UTF-8 in the corpus. > > Make that option explicit so it can be also used when JIT is not > enabled and pcre2_ma

Re: [PATCH] grep: skip UTF8 checks explicitally

2019-07-23 Thread Carlo Arenas
On Tue, Jul 23, 2019 at 5:47 AM Johannes Schindelin wrote: > > So when PCRE2 complains about the top two bits not being 0x80, it fails > to parse the bytes correctly (byte 2 is 0xbb, whose two top bits are > indeed 0x80). the error is confusing but it is not coming from the pattern, but from what

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread Jonathan Nieder
(cc: René Scharfe, "git archive" expert) Matt Turner wrote: > tar2sqfs (part of https://github.com/topics/tar2sqfs) rejects tarballs > made with git archive with the message > > invalid tar header checksum! > > tar2sqfs recomputes the tarball's checksum to verify it. Its checksum > implementat

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread David Oberhollenzer
Hi, the implementation of tar2sqfs was primarily based on `man 5 tar`[0], Wikipedia[1] and trial/error with archives generated by GNU tar and samples from [2] which I also integrated as test cases. On 7/23/19 10:08 PM, René Scharfe wrote: > Am 23.07.19 um 21:38 schrieb René Scharfe: >> is_checksu

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread Junio C Hamano
René Scharfe writes: >> Wow. The choice of %07o is as old as the very original of tar-tree >> implementation in our codebase, starting at ae64bbc1 ("tar-tree: >> Introduce write_entry()", 2006-03-25). > > Actually it's already in 731ab9ccf2 ("[PATCH] create tar archives of > tree on the fly", 20

Re: [PATCH] Close transport helper on protocol error

2019-07-23 Thread Junio C Hamano
Jeff King writes: > ... > At which point I do wonder if this is better handled by a wrapper > process which simply reaps everything. And indeed, people have already > come up with similar solutions for containers: > > https://github.com/Yelp/dumb-init > > So I dunno. I am not really opposed to

Re: [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag

2019-07-23 Thread Elijah Newren
On Tue, Jul 23, 2019 at 1:01 PM Rohit Ashiwal wrote: > On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood > wrote: > > [...] > > > > > @@ -489,6 +501,8 @@ int cmd_rebase__interactive(int argc, const char > > > **argv, const char *prefix) > > > { OPTION_STRING, 'S', "gpg-sign", &opts.gp

Re: [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag

2019-07-23 Thread Junio C Hamano
Rohit Ashiwal writes: > Hi Junio > > On Fri, 19 Jul 2019 14:33:49 -0700 Junio C Hamano wrote: >> >> > t/t3431-rebase-options-compatibility.sh | 66 + >> >> Isn't 3431 already taken? > > It is not in git/git[1]. That's a very selfish attitude ;-) Pay attention to what

Re: [**EXTERNAL**] Re: Possible bug in Makefile when executing curl-config

2019-07-23 Thread Jeff King
On Tue, Jul 23, 2019 at 07:43:01PM +, Raitanen, Adam wrote: > Yes there is a config.mak.autogen and it does not have an entry for > CURL_CONFIG, although it has a correct entry for CURLDIR. > > The config.log also shows it checking for curl-config and not finding it then > proceeding anyway

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread René Scharfe
Am 23.07.19 um 21:38 schrieb René Scharfe: > is_checksum_valid() in > https://github.com/AgentD/squashfs-tools-ng/blob/master/lib/tar/checksum.c > compares the formatted checksum byte-by-byte. That seems > unnecessarily strict. Parsing and comparing the numerical value > of the checksum would be

RE: [**EXTERNAL**] Re: Possible bug in Makefile when executing curl-config

2019-07-23 Thread Raitanen, Adam
Yes there is a config.mak.autogen and it does not have an entry for CURL_CONFIG, although it has a correct entry for CURLDIR. The config.log also shows it checking for curl-config and not finding it then proceeding anyway: configure:5917: checking for curl-config configure:5945: result: no ...

Re: [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag

2019-07-23 Thread Rohit Ashiwal
Hi Junio On Fri, 19 Jul 2019 14:33:49 -0700 Junio C Hamano wrote: > > > t/t3431-rebase-options-compatibility.sh | 66 + > > Isn't 3431 already taken? It is not in git/git[1]. > > 5 files changed, 97 insertions(+), 6 deletions(-) > > create mode 100755 t/t3431-rebase-

Re: [GSoC][PATCH v2 1/1] rebase -i: add --ignore-whitespace flag

2019-07-23 Thread Rohit Ashiwal
Hi Phillip On Mon, 22 Jul 2019 11:00:40 +0100 Phillip Wood wrote: > > [...] > > > > + if (opts->ignore_whitespace) { > > + struct strbuf buf = STRBUF_INIT; > > + > > + if (opts->strategy_opts) > > + strbuf_addstr(&buf, opts->strategy_opts); > > + > > +

Re: [GSoC][PATCH v2 2/2] rebase -i: support --committer-date-is-author-date

2019-07-23 Thread Rohit Ashiwal
Hi Phillip On Sat, 20 Jul 2019 15:56:50 +0100 Phillip Wood wrote: > > [...] > > > @@ -467,6 +470,9 @@ int cmd_rebase__interactive(int argc, const char > > **argv, const char *prefix) > > OPT_BOOL(0, "autosquash", &opts.autosquash, > > N_("move commits that beg

Re: [PATCH] Close transport helper on protocol error

2019-07-23 Thread Jeff King
On Tue, Jul 23, 2019 at 10:33:10AM -0700, Junio C Hamano wrote: > > + if (recvline(data, &buf)){ > > + release_helper(transport); > > exit(128); > > + } > > This, together with other exit(128) we see in this patch now have > release_helepr

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread René Scharfe
Am 23.07.19 um 18:49 schrieb Junio C Hamano: > Matt Turner writes: > >> tar2sqfs (part of https://github.com/topics/tar2sqfs) rejects tarballs >> made with git archive with the message >> >> invalid tar header checksum! >> >> tar2sqfs recomputes the tarball's checksum to verify it. Its checksu

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread Jeff King
On Tue, Jul 23, 2019 at 09:49:44AM -0700, Junio C Hamano wrote: > I think a change like this would impact kernel.org folks' tarball > uploading tool, but that is not a reason not to apply this patch. That was my thought, too. Distro projects like homebrew rely on stable hashes of upstream tarball

[PATCH] xdiff: clamp function context indices in post-image

2019-07-23 Thread Jeff King
After finding a function line for --function-context in the pre-image, xdl_emit_diff() calculates the equivalent line in the post-image. It assumes that the lines between changes are the same on both sides. If the option --ignore-blank-lines was also given then this is not necessarily true. Clam

Re: [PATCH] grep: print the pcre2_jit_on value

2019-07-23 Thread Johannes Schindelin
Hi Beat, On Mon, 22 Jul 2019, Beat Bolli wrote: > When pcre2_jit_on is neither 1 nor 0, the BUG() call printed the value > of pcre1_jit_on. > > Print the value of pcre2_jit_on instead. > > Signed-off-by: Beat Bolli > --- > grep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff

Re: [PATCH] grep: print the pcre2_jit_on value

2019-07-23 Thread Junio C Hamano
Beat Bolli writes: > When pcre2_jit_on is neither 1 nor 0, the BUG() call printed the value > of pcre1_jit_on. > > Print the value of pcre2_jit_on instead. > > Signed-off-by: Beat Bolli > --- Thanks. > grep.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/grep.c b/g

Re: [PATCH] Close transport helper on protocol error

2019-07-23 Thread Junio C Hamano
thibault.ja...@gmail.com writes: > Subject: Re: [PATCH] Close transport helper on protocol error Perhaps Subject: transport: close helper on protocol error > +static int disconnect_helper(struct transport *transport); > + > +static int disconnect_helper_data(struct helper_data *data); Even

Re: [PATCH] archive: Store checksum correctly

2019-07-23 Thread Junio C Hamano
Matt Turner writes: > tar2sqfs (part of https://github.com/topics/tar2sqfs) rejects tarballs > made with git archive with the message > > invalid tar header checksum! > > tar2sqfs recomputes the tarball's checksum to verify it. Its checksum > implementation agrees with GNU tar, which contains

Re: What's cooking in git.git (Jul 2019, #04; Thu, 18)

2019-07-23 Thread Junio C Hamano
Matthew DeVore writes: > I gave some > input earlier in this message: > > https://public-inbox.org/git/20190714231558.ga24...@comcast.net/ Thanks, that helped a lot and I think what we have is good now.

Re: jk/test-commit-bulk,

2019-07-23 Thread Junio C Hamano
Jeff King writes: >> Needs a bit more polishing. >> I think I spotted one unused command, which we may want to remove, though. > > I think these comments are out-of-date. The unused command was fixed up > in v2 of the first patch, and then I did a little extra polishing in v3: > > https://pub

Re: [PATCH 5/5] repo-settings: create feature.experimental setting

2019-07-23 Thread Johannes Schindelin
Hi Stolee, On Mon, 22 Jul 2019, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The 'feature.experimental' setting includes config options that are > not committed to become defaults, but could use additional testing. > > Update the following config settings to take new default

Re: [PATCH 3/5] repo-settings: parse core.untrackedCache

2019-07-23 Thread Johannes Schindelin
Hi Stolee, On Mon, 22 Jul 2019, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The core.untrackedCache config setting is slightly complicated, > so clarify its use and centralize its parsing into the repo > settings. > > The default value is "keep" (returned as -1), which pers

Re: [PATCH 2/5] repo-settings: add feature.manyCommits setting

2019-07-23 Thread Johannes Schindelin
Hi Stolee, On Mon, 22 Jul 2019, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > When a repo has many commits, it is helpful to write and read the > commit-graph file. Future changes to Git may include new config > settings that are benefitial in this scenario. s/benefitial/ben

[PATCH] l10n: es: Amend accent marks

2019-07-23 Thread Claudio J. Paz
Signed-off-by: Claudio J. Paz --- po/es.po | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/es.po b/po/es.po index edf7b25b8..bda3bbd41 100644 --- a/po/es.po +++ b/po/es.po @@ -3215,7 +3215,7 @@ msgstr "se esperaba '%s', se recibió '%s'" #: fetch-pack.c:1

Re: [PATCH 1/5] repo-settings: consolidate some config settings

2019-07-23 Thread Johannes Schindelin
Hi Stolee, On Mon, 22 Jul 2019, Derrick Stolee via GitGitGadget wrote: > diff --git a/builtin/gc.c b/builtin/gc.c > index c18efadda5..243be2907b 100644 > --- a/builtin/gc.c > +++ b/builtin/gc.c > @@ -27,6 +27,7 @@ > #include "pack-objects.h" > #include "blob.h" > #include "tree.h" > +#include

Re: [PATCH] grep: skip UTF8 checks explicitally

2019-07-23 Thread Johannes Schindelin
Hi Carlo, On Mon, 22 Jul 2019, Carlo Arenas wrote: > On Mon, Jul 22, 2019 at 12:42 PM Ævar Arnfjörð Bjarmason > wrote: > > > > On Mon, Jul 22 2019, Johannes Schindelin wrote: > > > > > So I am fine with this patch. > > > > I'm not, not because I dislike the approach. I haven't made up my mind >