Re: [RFC] Improved git signing interface

2019-07-29 Thread Jeff King
On Mon, Jul 22, 2019 at 04:16:15PM +0200, Ibrahim El Rhezzali wrote: > I have been selected by the Linux Foundation to work on a summer > project. I would like to abstract the git signing interface and add > support for signatures using decentralized identifiers (DID). > Decentralized identifiers

Re: Antw: Re: blank lines in pre-created merge message

2019-07-29 Thread Ulrich Windl
>>> Johannes Schindelin schrieb am 25.07.2019 um 13:58 in Nachricht : > Hi Ulrich, > > On Thu, 25 Jul 2019, Ulrich Windl wrote: > >> >>> Johannes Schindelin schrieb am 25.07.2019 um >> 12:07 >> in Nachricht : >> > >> > On Wed, 24 Jul 2019, Ulrich Windl wrote: >> > >> >> When using "git merge ‑‑

Re: [PATCH v1 1/1] pack-refs: pack expired loose refs to packed_refs

2019-07-29 Thread Jeff King
On Mon, Jul 22, 2019 at 02:17:39AM +0800, 16657101...@163.com wrote: > From: Sun Chao > > When a packed ref is deleted, the whole packed-refs file is > rewrite and omit the ref that no longer exists. However if > another gc command is running and call `pack-refs --all` > simultaneously, there is

[L10N] Kickoff for Git 2.23.0 round #1

2019-07-29 Thread Jiang Xin
Hi, Git v2.23.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 130 updated messages need to be translated since last update: l10n: git.pot: v2.23.0 round 1 (130 new, 35 removed) Generate po/git.pot from v2.23.0-rc0 for git v2.23.0 l10n round

Re: [RFC PATCH v2] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Carlo Arenas
On Mon, Jul 29, 2019 at 10:47 AM Junio C Hamano wrote: > René Scharfe writes: > >> +pcre.jit:: > >> +If set to false, disable JIT when using PCRE. Defaults to > >> +true. > >> +if set to -1 will try first to use JIT and fallback to the > >> +interpreter instead of returning an er

[PATCH] send-email: Ask if a patch should be sent twice

2019-07-29 Thread Dmitry Safonov
I was almost certain that git won't let me send the same patch twice, but today I've managed to double-send a directory by a mistake: git send-email --to linux-ker...@vger.kernel.org /tmp/timens/ --cc 'Dmitry Safonov <0x7f454...@gmail.com>' /tmp/timens/` [I haven't noticed that

Re: [PATCH 3/3] grep: plug leak of pcre chartables in PCRE2

2019-07-29 Thread Carlo Arenas
On Mon, Jul 29, 2019 at 1:35 PM René Scharfe wrote: > > Am 28.07.19 um 03:41 schrieb Carlo Arenas: > > On Sat, Jul 27, 2019 at 4:48 PM Ævar Arnfjörð Bjarmason > > wrote: > >>> + free((void *)p->pcre_tables); > >> > >> Is the cast really needed? I'm rusty on the rules, removing it from the > >

Re: [PATCH v2 4/4] t7503: add tests for pre-merge-hook

2019-07-29 Thread Josh Steadmon
On 2019.07.29 22:04, Martin Ågren wrote: > On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > > +test_expect_success '--no-verify with succeeding hook (merge)' ' > > + > > + git checkout side && > > + git merge --no-verify -m "merge master" master && > > + git checkout master >

Re: [PATCH v2 0/4] pre-merge hook

2019-07-29 Thread Josh Steadmon
On 2019.07.29 22:29, Martin Ågren wrote: > On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote: > > This series revives an old suggestion [...] to make merge honor > > pre-commit hook or a separate pre-merge hook. Since pre-commit does not > > receive any arguments (which the hook could use tell bet

Re: [PATCH v2 3/4] merge: --no-verify to bypass pre-merge hook

2019-07-29 Thread Josh Steadmon
On 2019.07.29 22:02, Martin Ågren wrote: > On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > > From: Michael J Gruber > > > > Analogous to commit, introduce a '--no-verify' option which bypasses the > > pre-merge hook. The shorthand '-n' is taken by the (non-existing) > > '--no-stat' already.

Re: [PATCH v2 0/4] pre-merge hook

2019-07-29 Thread Josh Steadmon
On 2019.07.29 22:09, Martin Ågren wrote: > On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote: > > * Martin's objection on 1/4 that the sample hook would always exit > > successfully is (I believe) incorrect. To test this, I ran > > "/bin/true && exec test 0 == 1" in a /bin/sh subshell, and it

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Jeff King
On Mon, Jul 29, 2019 at 02:44:00PM -0700, Junio C Hamano wrote: > > Hmm, true. I'd almost argue that --force-with-lease, at least in its > > default mode with no explicit lease source specified, should allow an > > update from X to Y to be a successful noop if the remote "somehow" > > already move

RE: 'git show -c' omits hunk even though file was modified from all parents

2019-07-29 Thread Ralph Maalouf
Ahh that clears it up for me. I incorrectly assumed that at minimum that each "< Sent: Monday, July 29, 2019 5:46 PM To: Ralph Maalouf Cc: 'git@vger.kernel.org' Subject: Re: 'git show -c' omits hunk even though file was modified from all parents Ralph Maalouf writes: > "We do not show h

[RFC PATCH] trace2: don't overload target directories

2019-07-29 Thread Josh Steadmon
trace2 can write files into a target directory. With heavy usage, this directory can fill up with files, causing difficulty for trace-processing systems. When trace2 would write a file to a target directory, first check whether or not the directory is overloaded. A directory is overloaded if there

Re: [PATCH v2 00/23] Reinstate support for Visual Studio

2019-07-29 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > A long time ago, we added support to build .sln and .vcproj files for use > within Visual Studio, so that Git could be built in that popular IDE. > ... > Changes since v1: > > * The empty directory templates/blt/branches/ is now created as part of

[ANNOUNCE] Git v2.23.0-rc0

2019-07-29 Thread Junio C Hamano
An early preview release Git v2.23.0-rc0 is now available for testing at the usual places. It is comprised of 420 non-merge commits since v2.22.0, contributed by 62 people, 23 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The followi

What's cooking in git.git (Jul 2019, #07; Mon, 29)

2019-07-29 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. The first preview for 2.23 has bee

Re: 'git show -c' omits hunk even though file was modified from all parents

2019-07-29 Thread Junio C Hamano
Ralph Maalouf writes: > "We do not show hunks that match one of the parents ". But in case > 1 the second hunk matches one of the parents yet `git show -c` > still outputs it. > > diff --combined test1 > index 02ef2b0,ffc05f2..59d575d > --- a/test1 > +++ b/test1 > @@@ -1,8 -1,8 +1,9 @@@ > One >

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Junio C Hamano
Jeff King writes: > Yeah, the auto-update of the tracking refs came later (so I think you > could argue the bad interaction is my fault!). Heh, I somehow thought it was somebody else. > Hmm, true. I'd almost argue that --force-with-lease, at least in its > default mode with no explicit lease so

Re: [PATCH] Documentation/git-fsck.txt: include fsck.* config variables

2019-07-29 Thread Junio C Hamano
Jeff King writes: > On Mon, Jul 29, 2019 at 08:48:28AM -0700, Junio C Hamano wrote: > >> > Before this include let's add: >> > >> > The below documentation is the same as what’s found in >> > git-config(1): >> >> I actually do not think we would want to do that. I am all for the >> kind

Re: [GSoC] My project blog

2019-07-29 Thread Matheus Tavares Bernardino
Hi, everyone I just posted an update about my project here: https://matheustavares.gitlab.io/posts/week-10-a-bug-in-git-grep-submodules This one is focused on a patch to correct a bug at git-grep --recurse-submodules and some tests for the parallel inflation patchset. Please, feel free to leave an

Re: [PATCH 3/3] grep: plug leak of pcre chartables in PCRE2

2019-07-29 Thread René Scharfe
Am 28.07.19 um 03:41 schrieb Carlo Arenas: > On Sat, Jul 27, 2019 at 4:48 PM Ævar Arnfjörð Bjarmason > wrote: >>> + free((void *)p->pcre_tables); >> >> Is the cast really needed? I'm rusty on the rules, removing it from the >> pcre_free() you might have copied this from produces a warning for

Re: [PATCH v2 0/4] pre-merge hook

2019-07-29 Thread Martin Ågren
On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote: > This series revives an old suggestion [...] to make merge honor > pre-commit hook or a separate pre-merge hook. Since pre-commit does not > receive any arguments (which the hook could use tell between commit and > merge) and in order to keep exi

Re: Weird behavior with git grep --recurse-submodules

2019-07-29 Thread Matheus Tavares Bernardino
On Tue, Jul 16, 2019 at 3:09 PM Daniel Zaoui wrote: > > Hi Matheus, Hi, Daniel I'm sorry, your last message went to my spam folder for some reason :( > Thank you for your response. > > I really hope the change Brandon made is not a project decision. At least, it > does seem to me like a bug. >

Re: Settings for minimizing repacking (and keeping 'rsync' happy)

2019-07-29 Thread Jeff King
On Mon, Jul 29, 2019 at 02:56:34PM +0200, Ævar Arnfjörð Bjarmason wrote: > The thread I started at > https://public-inbox.org/git/87bmhiykvw@evledraar.gmail.com/ should > also be of interest. I.e. we could have some knobs to create more > "stable" packs, I know rsync does some in-file hashing,

Re: [PATCH] Documentation/git-fsck.txt: include fsck.* config variables

2019-07-29 Thread Jeff King
On Mon, Jul 29, 2019 at 08:48:28AM -0700, Junio C Hamano wrote: > > Before this include let's add: > > > > The below documentation is the same as what’s found in > > git-config(1): > > I actually do not think we would want to do that. I am all for the > kind of 'include' proposed by this

Re: [PATCH v2 0/4] pre-merge hook

2019-07-29 Thread Martin Ågren
On Fri, 19 Jul 2019 at 01:56, Josh Steadmon wrote: > * Martin's objection on 1/4 that the sample hook would always exit > successfully is (I believe) incorrect. To test this, I ran > "/bin/true && exec test 0 == 1" in a /bin/sh subshell, and it > correctly had a non-zero exit status. I retr

[PATCH v2 15/23] contrib/buildsystems: also handle -lexpat

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This is a dependency required for the non-smart HTTP backend. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index c35844a0c7..

[PATCH v2 09/23] contrib/buildsystems: ignore gettext stuff

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Git's build contains steps to handle internationalization. This caused hiccups in the parser used to generate QMake/Visual Studio project files. As those steps are irrelevant in this context, let's just ignore them. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schin

[PATCH v2 22/23] bin-wrappers: append `.exe` to target paths if necessary

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin When compiling with Visual Studio, the projects' names are identical to the executables modulo the extensions. Read: there will exist both a directory called `git` as well as an executable called `git.exe` in the end. Which means that the bin-wrappers *need* to target th

[PATCH v2 05/23] contrib/buildsystems: ignore invalidcontinue.obj

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also on

[PATCH v2 18/23] msvc: add a Makefile target to pre-generate the Visual Studio solution

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The entire idea of generating the VS solution makes only sense if we generate it via Continuous Integration; otherwise potential users would still have to download the entire Git for Windows SDK. If we pre-generate the Visual Studio solution, Git can be built entirely w

[PATCH v2 10/23] contrib/buildsystems: redirect errors of the dry run into a log file

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Rather than swallowing the errors, it is better to have them in a file. To make it obvious what this is about, use the file name 'msvc-build-makedryerrors.txt'. Further, if the output is empty, simply delete that file. As we target Git for Windows' SDK (which, unlike its pre

[PATCH v2 16/23] contrib/buildsystems: handle options starting with a slash

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin With the recent changes to allow building with MSVC=1, we now pass the /OPT:REF option to the compiler. This confuses the parser that wants to turn the output of a dry run into project definitions for QMake and Visual Studio: Unhandled link option @ line 213: /O

[PATCH v2 01/23] Vcproj.pm: auto-generate GUIDs

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin We ran out GUIDs. Again. But there is no need to: we can generate them semi-randomly from the target file name of the project. Note: the Vcproj generator is probably only interesting for historical reasons; nevertheless, the upcoming Vcxproj generator (to support modern

[PATCH v2 00/23] Reinstate support for Visual Studio

2019-07-29 Thread Johannes Schindelin via GitGitGadget
A long time ago, we added support to build .sln and .vcproj files for use within Visual Studio, so that Git could be built in that popular IDE. This support languished for years and was finally brought back into Git for Windows partially through the jh/msvc branch that was just merged into master

[PATCH v2 08/23] contrib/buildsystems: handle quoted spaces in filenames

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The engine.pl script expects file names not to contain spaces. However, paths with spaces are quite prevalent on Windows. Use shellwords() rather than split() to parse them correctly. Helped-by: Junio C Hamano Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin

[PATCH v2 12/23] contrib/buildsystems: error out on unknown option

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin One time too many did this developer call the `generate` script passing a `--make-out=` option that was happily ignored (because there should be a space, not an equal sign, between `--make-out` and the path). And one time too many, this script not only ignored it but di

[PATCH v2 04/23] Vcproj.pm: urlencode '<' and '>' when generating VC projects

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 8 1 file changed, 8 insertions(+) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index b17800184c..737647e76a 100644 --- a

[PATCH v2 20/23] .gitignore: touch up the entries regarding Visual Studio

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multiple projects (one per target). Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- .gitignore | 5 +++-- 1 file changed, 3

[PATCH v2 17/23] contrib/buildsystems: add a backend for modern Visual Studio versions

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Based on the previous patches in this patch series that fixed the generator for `.vcproj` files (which were used by Visual Studio prior to 2015 to define projects), this patch offers to generate project definitions for neweer versions of Visual Studio (which use `.vcxpro

[PATCH v2 07/23] contrib/buildsystems: fix misleading error message

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley The error message talked about a "lib option", but it clearly referred to a link option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsyst

[PATCH v2 02/23] Vcproj.pm: list git.exe first to be startup project

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Visual Studio takes the first listed application/library as the default startup project [1]. Detect the 'git' project and place it at the head of the project list, rather than at the tail. Export the apps list before libs list for both the projects and global structures of t

[PATCH v2 23/23] git: avoid calling aliased builtins via their dashed form

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin This is one of the few places where Git violates its own deprecation of the dashed form. It is not necessary, either. As of 595d59e2b53 (git.c: ignore pager.* when launching builtin as dashed external, 2017-08-02), Git wants to ignore the pager.* config setting when exp

[PATCH v2 14/23] contrib/buildsystems: handle libiconv, too

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Git's test suite shows tons of breakages unless Git is compiled *without* NO_ICONV. That means, in turn, that we need to generate build definitions *with* libiconv, which in turn implies that we have to handle the -liconv option properly. Signed-off-by: Johannes Schinde

[PATCH v2 06/23] contrib/buildsystems: ignore irrelevant files in Generators/

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The Generators/ directory can contain spurious files such as editors' backup files. Even worse, there could be .swp files which are not even valid Perl scripts. Let's just ignore anything but .pm files in said directory. Signed-off-by: Johannes Schindelin --- contrib

[PATCH v2 19/23] vcxproj: also link-or-copy builtins

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The default location for `.exe` files linked by Visual Studio depends on the mode (debug vs release) and the architecture. Meaning: after a full build, there is a `git.exe` in the top-level directory, but none of the built-ins are linked.. When running a test script in

[PATCH v2 21/23] .gitignore: ignore Visual Studio's temporary/generated files

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e7bb15d301..fcfb708b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -233,4 +233,7 @@ *.manifest Debug/ Release/ +/UpgradeLog*.htm +/

[PATCH v2 03/23] Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool

2019-07-29 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin It is not necessary, and Visual Studio 2015 no longer supports it, anyway. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 12 1 file changed, 12 deletions(-) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/co

[PATCH v2 13/23] contrib/buildsystems: handle the curl library option

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Upon seeing the '-lcurl' option, point to the libcurl.lib. While there, fix the elsif indentation. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/con

[PATCH v2 11/23] contrib/buildsystems: optionally capture the dry-run in a file

2019-07-29 Thread Philip Oakley via GitGitGadget
From: Philip Oakley Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out ` in subsequent runs via the `--in ` option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --

Re: [PATCH v2 4/4] t7503: add tests for pre-merge-hook

2019-07-29 Thread Martin Ågren
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > +test_expect_success '--no-verify with succeeding hook (merge)' ' > + > + git checkout side && > + git merge --no-verify -m "merge master" master && > + git checkout master > + > +' This test doesn't even try to verify that th

Re: [PATCH v2 3/4] merge: --no-verify to bypass pre-merge hook

2019-07-29 Thread Martin Ågren
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > From: Michael J Gruber > > Analogous to commit, introduce a '--no-verify' option which bypasses the > pre-merge hook. The shorthand '-n' is taken by the (non-existing) > '--no-stat' already. I don't understand this "(non-existing)". I realize

Re: [PATCH v2 1/4] git-merge: Honor pre-merge hook

2019-07-29 Thread Martin Ågren
On Fri, 19 Jul 2019 at 00:57, Josh Steadmon wrote: > --- /dev/null > +++ b/templates/hooks--pre-merge.sample > @@ -0,0 +1,13 @@ > +#!/bin/sh > +# > +# An example hook script to verify what is about to be committed. > +# Called by "git merge" with no arguments. The hook should > +# exit with non-z

Re: git name-rev segfault

2019-07-29 Thread Tamas Papp
Thanks for letting me know and for the corrections too. Cheers, tamas On 7/29/19 9:50 PM, Jeff King wrote: On Mon, Jul 29, 2019 at 04:19:47PM +0200, Tamas Papp wrote: Generate 100k file into a repository: #!/bin/bash rm -rf .git test.file git init git config user.email a@b git config use

RE: 'git show -c' omits hunk even though file was modified from all parents

2019-07-29 Thread Ralph Maalouf
"We do not show hunks that match one of the parents ". But in case 1 the second hunk matches one of the parents yet `git show -c` still outputs it. diff --combined test1 index 02ef2b0,ffc05f2..59d575d --- a/test1 +++ b/test1 @@@ -1,8 -1,8 +1,9 @@@ One +Two + Four Three Seven -Ten +Eigh

Re: git name-rev segfault

2019-07-29 Thread Jeff King
On Mon, Jul 29, 2019 at 04:19:47PM +0200, Tamas Papp wrote: > Generate 100k file into a repository: > > #!/bin/bash > > rm -rf .git test.file > git init > git config user.email a@b > git config user.name c > > time for i in {1..10} > do >   [ $((i % 2)) -eq 1 ] && echo $i>test.file || echo

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Jeff King
On Mon, Jul 29, 2019 at 06:33:32AM -0700, Junio C Hamano wrote: > Jeff King writes: > > > My general feeling is that having multiple push URLs for a remote is a > > poorly designed feature in Git (and I think the discussion elsewhere in > > this thread went there, as well). > > That's being gen

Re: 'git show -c' omits hunk even though file was modified from all parents

2019-07-29 Thread Junio C Hamano
So in short, one side has 1/2/3//7/10/9 in fileA and the other side has 1/4/3//7/10/9, and the result of the merge is recorded as 1/2/3//7/10/9. > I realize that this is because fileA in the merge commit's tree is > identical to what it was in branchA prior to the merge (so the > output of 'git sh

'git show -c' omits hunk even though file was modified from all parents

2019-07-29 Thread Ralph Maalouf
Git version 2.17.1 Commit C0 contains FileA which is empty. Both branchA and branchB point to C0. >From branchA I add the following contents to FileA (and then commit): --- One Two Three Seven Eight Nine --- >From branchB I add the following contents to FileA (and then commit): --- One Four Th

Re: [RFC PATCH v2] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Junio C Hamano
René Scharfe writes: >> +pcre.jit:: >> +If set to false, disable JIT when using PCRE. Defaults to >> +true. >> +if set to -1 will try first to use JIT and fallback to the >> +interpreter instead of returning an error. > > Why not implement only -1, without adding this config sett

Re: [PATCH v2 4/8] grep: consistently use "p->fixed" in compile_regexp()

2019-07-29 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> The reason we ignore the user's choice here is because you might >> e.g. set grep.patternType=extended in your config, and you'd still want >> grepping for a fixed "foo" to be fast. > > ...and more generally, for any future sanity of implementation and > mainten

Re: [PATCH v2 0/8] grep: PCRE JIT fixes + ab/no-kwset fix

2019-07-29 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > I have some fix-for-the-fix and was going to submit a v3 of this series, > but I think the more responsible thing to do at this point, especially > with various patches from Carlo that need to be integrated in one way or > another, is to back it out until the out

Re: [PATCH v2] reset: unstage empty deleted ita files

2019-07-29 Thread Junio C Hamano
Varun Naik writes: > To guard against changes to the test cases in the future, would it be > better if I write something like the following instead? > git diff --cached --exit-code HEAD nonempty empty Hmph, that is probably a good idea, as it matches the kind of "reset" we just did, which is

Re: [PATCH v2 04/20] merge-recursive: exit early if index != head

2019-07-29 Thread Junio C Hamano
Elijah Newren writes: > On Fri, Jul 26, 2019 at 12:32 PM Junio C Hamano wrote: >> >> Elijah Newren writes: >> >> > Make sure we do the index == head check at the beginning of the merge, >> > and error out immediately if it fails. While we're at it, fix a small >> > leak in the show-the-error c

Re: [PATCH] Documentation/git-fsck.txt: include fsck.* config variables

2019-07-29 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Mon, Jul 29 2019, SZEDER Gábor wrote: > >> The 'fsck.skipList' and 'fsck.' config variables might be >> easier to discover when they are documented in 'git fsck's man page. >> >> Signed-off-by: SZEDER Gábor >> --- >> Documentation/git-fsck.txt | 5 + >>

Re: [PATCH] Documentation/git-fsck.txt: include fsck.* config variables

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, SZEDER Gábor wrote: > The 'fsck.skipList' and 'fsck.' config variables might be > easier to discover when they are documented in 'git fsck's man page. > > Signed-off-by: SZEDER Gábor > --- > Documentation/git-fsck.txt | 5 + > 1 file changed, 5 insertions(+) > > diff -

Re: [RFC PATCH v2] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread René Scharfe
Am 29.07.19 um 12:59 schrieb Carlo Marcelo Arenas Belón: > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never > had one, forcing the use of JIT if -P was requested. > > After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) > the PCRE2 engine will be used more broadl

Re: Settings for minimizing repacking (and keeping 'rsync' happy)

2019-07-29 Thread Konstantin Ryabitsev
On Sat, 27 Jul 2019 at 19:41, ardi wrote: > > Hi! > > Some of my Git repositories have mirrors, maintained with 'rsync'. I > want to have some level of repacking, so that the repositories are > efficient, but I also want it to minimize it, so that 'rsync' never > has to perform a big transfer for

Re: Problem with fsck and invalid submodule path in history

2019-07-29 Thread Olivier Bornet
Hello, > On 29 Jul 2019, at 11:39, SZEDER Gábor wrote: > > However, you can tell 'git fsck' to ignore it using the > 'fsck.skipList' configuration variable (see 'git help config'; for > some reason it's not included in 'git fsck's documentation): Thanks for pointing it out. Thanks to it, we have

git name-rev segfault

2019-07-29 Thread Tamas Papp
hi All, We ran into a segfault with all version of command line git. We are able to reproduce this issue by this way: Generate 100k file into a repository: #!/bin/bash rm -rf .git test.file git init git config user.email a@b git config user.name c time for i in {1..10} do   [ $((i % 2)

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Christopher Head
On Mon, 29 Jul 2019 06:33:32 -0700 Junio C Hamano wrote: > I agree but only if the listed ones are separate ones. If the URLs > are separate paths to reach the same remote (e.g. https:// and ssh:// > going to the same place), the current definition would make more > sense. I realize I’m a bit b

Re: [PATCH v2 01/20] merge-recursive: fix minor memory leak in error condition

2019-07-29 Thread Derrick Stolee
On 7/26/2019 2:31 PM, Junio C Hamano wrote: > Elijah Newren writes: > >> Returning before freeing the allocated buffer is suboptimal; as with >> elsewhere in the same function, make sure buf gets free'd. > > I do not have a real objection to the patch text, but the above > justification does not

Re: [PATCH v3] builtin/merge: support --squash --commit

2019-07-29 Thread Edmundo Carmona Antoranz
On Thu, Jul 18, 2019 at 11:40 PM Edmundo Carmona Antoranz wrote: > > Using --squash made git stop regardless of conflicts so that the > user could finish the operation with a later call to git-commit. > > Now --squash --commit allows for the operation to finish with the > new revision if there are

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Junio C Hamano
Jeff King writes: > My general feeling is that having multiple push URLs for a remote is a > poorly designed feature in Git (and I think the discussion elsewhere in > this thread went there, as well). That's being generous. I do not think it was even designed---at least, the interaction with re

Re: Settings for minimizing repacking (and keeping 'rsync' happy)

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Jeff King wrote: > On Sun, Jul 28, 2019 at 01:41:34AM +0200, ardi wrote: > >> Some of my Git repositories have mirrors, maintained with 'rsync'. I >> want to have some level of repacking, so that the repositories are >> efficient, but I also want it to minimize it, so that '

Re: Warnings in gc.log can prevent gc --auto from running

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Jeff King wrote: > On Thu, Jul 25, 2019 at 07:18:57PM -0700, Gregory Szorc wrote: > >> I think I've found some undesirable behavior with regards to the >> behavior of `git gc --auto`. The tl;dr is that a warning message written >> to gc.log can result in `git gc --auto` effe

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Carlo Arenas wrote: > On Mon, Jul 29, 2019 at 1:55 AM Ævar Arnfjörð Bjarmason > wrote: >> >> On Mon, Jul 29 2019, Carlo Marcelo Arenas Belón wrote: >> >> > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never >> > had one, forcing the use of JIT if -P was r

Re: [RFC PATCH v2] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Carlo Arenas
Known Issues: * PCRE1 is broken, but fixing it would make more sense on top of the topic[1] (not in pu) * it depends on the current ab/pcre-jit-fixes that is missing 1 critical commit in pu * no tests yet; would need to extend it on top of the debug from Beat and test-tool changes from Ævar, neithe

[RFC PATCH v2] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Carlo Marcelo Arenas Belón
PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never had one, forcing the use of JIT if -P was requested. After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) the PCRE2 engine will be used more broadly and therefore adding this knob will allow users a escape from si

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Carlo Arenas
On Mon, Jul 29, 2019 at 1:55 AM Ævar Arnfjörð Bjarmason wrote: > > On Mon, Jul 29 2019, Carlo Marcelo Arenas Belón wrote: > > > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never > > had one, forcing the use of JIT if -P was requested. > > What's that PCRE1 compile-time flag? N

Re: Push force-with-lease with multi-URL remote

2019-07-29 Thread Jeff King
On Sat, Jul 27, 2019 at 09:54:40AM -0700, Christopher Head wrote: > For each URL: > 1. Read refs/heads/mybranch (call this commit X) > 2. Read refs/remotes/myremote/mybranch (call this commit Y) > 3. Send to the URL an atomic compare-and-swap, replacing Y with X. > 4. If step 3 succeeded, change r

Re: 2.22 issue across samba

2019-07-29 Thread Jeff King
On Fri, Jul 26, 2019 at 08:15:49PM +, Gary Poli wrote: > I'm running git for windows installed locally. Windows 10 Pro version > 1903 OS Build 18362.239. I have a repository on a UNIX machine running > AIX 7.1 TL4 SP2. I use SAMBA 3.0.23d to mount the drive for use. I > upgraded to git 2.22 an

Re: Warnings in gc.log can prevent gc --auto from running

2019-07-29 Thread Jeff King
On Thu, Jul 25, 2019 at 07:18:57PM -0700, Gregory Szorc wrote: > I think I've found some undesirable behavior with regards to the > behavior of `git gc --auto`. The tl;dr is that a warning message written > to gc.log can result in `git gc --auto` effectively disabling itself for > gc.logExpiry. Th

[PATCH] Documentation/git-fsck.txt: include fsck.* config variables

2019-07-29 Thread SZEDER Gábor
The 'fsck.skipList' and 'fsck.' config variables might be easier to discover when they are documented in 'git fsck's man page. Signed-off-by: SZEDER Gábor --- Documentation/git-fsck.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.t

Re: Settings for minimizing repacking (and keeping 'rsync' happy)

2019-07-29 Thread Jeff King
On Sun, Jul 28, 2019 at 01:41:34AM +0200, ardi wrote: > Some of my Git repositories have mirrors, maintained with 'rsync'. I > want to have some level of repacking, so that the repositories are > efficient, but I also want it to minimize it, so that 'rsync' never > has to perform a big transfer fo

Re: Problem with fsck and invalid submodule path in history

2019-07-29 Thread SZEDER Gábor
On Mon, Jul 29, 2019 at 09:58:52AM +0200, Olivier Bornet wrote: > I have a git repository with an error in a submodule path in the history. > The submodule path is “-f”, which is not allowed. But for some reason, it’s > in the history of the git, and I’m trying to find a way to manage it without

Re: [RFC PATCH 0/9] rebase -i: extend rebase.missingCommitsCheck to `--edit-todo' and co.

2019-07-29 Thread Phillip Wood
Hi Alban On 25/07/2019 21:26, Alban Gruin wrote: Hi Phillip, Le 24/07/2019 à 15:29, Phillip Wood a écrit : Hi Alban Thanks for working on this, it's great to see you back on the list and I think it would be a useful addition to rebase. Unfortunately I'm not sure about this implementation thou

Re: [PATCH v2 0/8] grep: PCRE JIT fixes + ab/no-kwset fix

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Fri, Jul 26 2019, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> 1-3 here are a re-roll on "next". I figured that was easier for >> everyone with the state of the in-flight patches, it certainly was for >> me. Sorry Junio if this creates a mess for you. > > As long as I can ju

Re: [PATCH v2 4/8] grep: consistently use "p->fixed" in compile_regexp()

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Ævar Arnfjörð Bjarmason wrote: > On Mon, Jul 29 2019, Carlo Arenas wrote: > >> On Fri, Jul 26, 2019 at 8:09 AM Ævar Arnfjörð Bjarmason >> wrote: >>> >>> It's less confusing to use that variable consistently that switch back >>> & forth between the two. >>> >>> Signed-off-by

Re: [PATCH] checkout.c: unstage empty deleted ita files

2019-07-29 Thread Jeff King
On Sun, Jul 28, 2019 at 11:54:38PM -0700, Varun Naik wrote: > > These two paragraphs would be a nice addition to the actual commit > > message. > > I will add them to the commit message, with some minor changes. Thanks! > > Hmm. This git-restore test means we don't apply to maint. But wouldn't

Re: [PATCH v2 4/8] grep: consistently use "p->fixed" in compile_regexp()

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Carlo Arenas wrote: > On Fri, Jul 26, 2019 at 8:09 AM Ævar Arnfjörð Bjarmason > wrote: >> >> It's less confusing to use that variable consistently that switch back >> & forth between the two. >> >> Signed-off-by: Ævar Arnfjörð Bjarmason >> --- >> grep.c | 2 +- >> 1 file

Re: [RFC PATCH] grep: allow for run time disabling of JIT in PCRE

2019-07-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 29 2019, Carlo Marcelo Arenas Belón wrote: > PCRE1 allowed for a compile time flag to disable JIT, but PCRE2 never > had one, forcing the use of JIT if -P was requested. What's that PCRE1 compile-time flag? > After ed0479ce3d (Merge branch 'ab/no-kwset' into next, 2019-07-15) > the

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-29 Thread Pratyush Yadav
On 29/07/19 10:39 AM, Junio C Hamano wrote: "brian m. carlson" writes: These are probably pretty cheap on all but the largest repositories. I was worried we were enumerating all refs or all history or something like that. ui_do_rescan changes the focus to the first diff. It is executed when

Re: [PATCH] grep: print the pcre2_jit_on value

2019-07-29 Thread Carlo Arenas
On Thu, Jul 25, 2019 at 5:50 AM Johannes Schindelin wrote: > On Wed, 24 Jul 2019, Beat Bolli wrote: > > Do you mean something like this? > > Yes! Ideally, though, you want to print those values closing to the match function (pcre_exec for PCRE1 or pcre2_[jit_]match for PCRE2 as they might change

Re: [PATCH] git-gui: Perform rescan on window focus-in

2019-07-29 Thread Pratyush Yadav
On 29/07/19 7:58 AM, Mark Levedahl wrote: On 7/28/19 6:49 PM, brian m. carlson wrote:> On 2019-07-28 at 22:10:29, Pratyush Yadav wrote: >> The function is not documented, and I only started spelunking the code a >> couple days back, so I'll try to answer with what I know. It might not be >>

Problem with fsck and invalid submodule path in history

2019-07-29 Thread Olivier Bornet
Hello, I have a git repository with an error in a submodule path in the history. The submodule path is “-f”, which is not allowed. But for some reason, it’s in the history of the git, and I’m trying to find a way to manage it without having to rewrite the full history on the main gitlab (if poss