[PATCH v3 02/18] grep: add tests for grep pattern types being passed to submodules

2017-04-20 Thread Ævar Arnfjörð Bjarmason
long correctly. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7814-grep-recurse-submodules.sh | 49 ++ 1 file changed, 49 insertions(+) diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh index 3c580b38b

[PATCH v3 10/18] grep: make grep.patternType=[pcre|pcre1] a synonym for "perl"

2017-04-20 Thread Ævar Arnfjörð Bjarmason
uot;pcre2" instead of "pcre1", and depending on how Git is compiled the more specific "pcre1" or "pcre2" pattern types might produce an error. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 9 + g

[PATCH v3 15/18] grep: add support for the PCRE v1 JIT API

2017-04-20 Thread Ævar Arnfjörð Bjarmason
ing, it'll only fail in cases where malloc() doesn't work, in which case we're screwed anyway. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- grep.c | 27 ++- grep.h | 5 + 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/grep.

[PATCH v3 16/18] grep: add support for PCRE v2

2017-04-20 Thread Ævar Arnfjörð Bjarmason
19.172322.833ee099.en.html Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 14 ++-- Makefile | 18 + builtin/grep.c | 7 +- configure.ac | 49 ++

[PATCH v3 18/18] Makefile & configure: make PCRE v2 the default PCRE implementation

2017-04-20 Thread Ævar Arnfjörð Bjarmason
Change the USE_LIBPCRE=YesPlease & --with-libpcre flags to the Makefile & configure script, respectively, to mean use PCRE v2, not PCRE v1. The legacy library is still available on request via USE_LIBPCRE1=YesPlease or --with-libpcre1. Signed-off-by: Ævar Arnfjörð Bjarmason <ava..

[PATCH v3 14/18] perf: add a performance comparison test of grep -E and -P

2017-04-20 Thread Ævar Arnfjörð Bjarmason
igned-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/perf/p7820-grep-engines.sh | 25 + 1 file changed, 25 insertions(+) create mode 100755 t/perf/p7820-grep-engines.sh diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh new file mode

[PATCH v3 11/18] test-lib: rename the LIBPCRE prerequisite to PCRE

2017-04-20 Thread Ævar Arnfjörð Bjarmason
e general name to make it clear that they work on both library versions. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/README| 4 ++-- t/t4202-log.sh | 10 +- t/t7810-grep.sh | 32

[PATCH v3 07/18] log: add exhaustive tests for pattern style options & config

2017-04-20 Thread Ævar Arnfjörð Bjarmason
matching method than the one it's told to use. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t4202-log.sh | 77 +- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index f57

[PATCH v3 17/18] grep: remove support concurrent use of both PCRE v1 & v2

2017-04-20 Thread Ævar Arnfjörð Bjarmason
libpcre2 to the configure script will produce an error. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 7 Makefile | 36 +-- builtin/grep.c | 3 --

[PATCH v3 12/18] grep: change the internal PCRE macro names to be PCRE1

2017-04-20 Thread Ævar Arnfjörð Bjarmason
code and the USE_LIBPCRE Makefile argument was added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09). At the time there was no indication that the PCRE project would release an entirely new & incompatible API around 3 years later. Signed-off-by: Ævar Arnfjörð Bjarmason

[PATCH v3 13/18] grep: change the internal PCRE code & header names to be PCRE1

2017-04-20 Thread Ævar Arnfjörð Bjarmason
tions behind this commit. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 4 ++-- grep.c | 56 grep.h | 10 +- revision.c | 2 +- 4 files changed, 36 insertions(+), 36 dele

[BUG] test suite broken with GETTEXT_POISON=YesPlease

2017-04-20 Thread Ævar Arnfjörð Bjarmason
As a refresh of everyone's memory (because mine needed it). This is a feature I added back in 2011 when the i18n support was initially added. There was concern at the time that we would inadvertently mark plumbing messages for translation, particularly something in a shared code path, and this

[PATCH v2] clone: add a --no-tags option to clone without tags

2017-04-19 Thread Ævar Arnfjörð Bjarmason
thout --single-branch to clone a repository without tags. Before this the only way of doing this was either by manually tweaking the config in a fresh repository: git init git && cat >git/.git/config < --- On Wed, Apr 19, 2017 at 3:38 AM, Junio C Hamano <gits...@pobox.com> w

Re: [PATCH 5/7] Add support for gnupg < 1.4

2017-04-13 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:45 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen <t...@jupiterrise.com> > wrote: >> This adds an OLD_GNUPG define to the Makefile which when activated will >> ensure git does not u

[PATCH] completion: expand "push --delete " for refs on that

2017-04-18 Thread Ævar Arnfjörð Bjarmason
out how to add a test for this, but all the existing tests pass, and all my manual testing of "git push --delete ..." does the right thing now. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- contrib/completion/git-completion.bash | 7 +-- 1 file changed, 5 insert

[PATCH] various: disallow --no-no-OPT for --no-opt options

2017-04-18 Thread Ævar Arnfjörð Bjarmason
with other --no-OPT options which do pass PARSE_OPT_NONEG. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- For this one I'm not bothering to track down & CC every single person who originally added these --no-OPT options. Clearly just a trivial bug we can fix. app

[PATCH v2 10/13] grep: change the internal PCRE code & header names to be PCRE1

2017-04-19 Thread Ævar Arnfjörð Bjarmason
tions behind this commit. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 4 ++-- grep.c | 56 grep.h | 10 +- revision.c | 2 +- 4 files changed, 36 insertions(+), 36 dele

[PATCH v2 12/13] grep: add support for the PCRE v1 JIT API

2017-04-19 Thread Ævar Arnfjörð Bjarmason
ing, it'll only fail in cases where malloc() doesn't work, in which case we're screwed anyway. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- grep.c | 27 ++- grep.h | 5 + 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/grep.

[PATCH v2 11/13] perf: add a performance comparison test of grep -E and -P

2017-04-19 Thread Ævar Arnfjörð Bjarmason
igned-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/perf/p7820-grep-engines.sh | 25 + 1 file changed, 25 insertions(+) create mode 100755 t/perf/p7820-grep-engines.sh diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh new file mode

[PATCH v2 13/13] grep: add support for PCRE v2

2017-04-19 Thread Ævar Arnfjörð Bjarmason
19.172322.833ee099.en.html Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 14 ++-- Makefile | 18 ++ builtin/grep.c | 4 +- configure.ac | 49 ++

[PATCH v2 09/13] grep: change the internal PCRE macro names to be PCRE1

2017-04-19 Thread Ævar Arnfjörð Bjarmason
code and the USE_LIBPCRE Makefile argument was added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09). At the time there was no indication that the PCRE project would release an entirely new & incompatible API around 3 years later. Signed-off-by: Ævar Arnfjörð Bjarmason

[PATCH v2 08/13] test-lib: rename the LIBPCRE prerequisite to PCRE

2017-04-19 Thread Ævar Arnfjörð Bjarmason
e general name to make it clear that they work on both library versions. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/README| 4 ++-- t/t4202-log.sh | 10 +- t/t7810-grep.sh | 30 +++--- t/

[PATCH v2 07/13] grep: make grep.patternType=[pcre|pcre1] a synonym for "perl"

2017-04-19 Thread Ævar Arnfjörð Bjarmason
uot;pcre2" instead of "pcre1", and depending on how Git is compiled the more specific "pcre1" or "pcre2" pattern types might produce an error. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 9 + grep.c

[PATCH v2 05/13] log: add -P as a synonym for --perl-regexp

2017-04-19 Thread Ævar Arnfjörð Bjarmason
ed in the aforementioned commit the --basic-regexp option can't have a corresponding -G argument, as the log command already uses that for -G. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/rev-list-options.txt | 1 + revision.c

[PATCH v2 04/13] log: add exhaustive tests for pattern style options & config

2017-04-19 Thread Ævar Arnfjörð Bjarmason
matching method than the one it's told to use. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t4202-log.sh | 77 +- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index f57

[PATCH v2 02/13] Makefile & configure: reword outdated comment about PCRE

2017-04-19 Thread Ævar Arnfjörð Bjarmason
they make less sence is the pattern everything else follows in that file. I'm not going to war against that as part of this change, just following the existing pattern. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Makefile | 6 -- configure.ac | 12 2 files ch

[PATCH v2 03/13] grep: add a test for backreferences in PCRE patterns

2017-04-19 Thread Ævar Arnfjörð Bjarmason
Add a test for backreferences such as (.)\1 in PCRE patterns. This test ensures that the PCRE_NO_AUTO_CAPTURE option isn't turned on. Before this change turning it on would break these sort of patterns, but wouldn't break any tests. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>

[PATCH v2 06/13] grep & rev-list doc: stop promising libpcre for --perl-regexp

2017-04-19 Thread Ævar Arnfjörð Bjarmason
he --perl-regexp option by default, depending on how Git is compiled. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-grep.txt | 4 ++-- Documentation/rev-list-options.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Docume

[PATCH v2 00/13] PCRE v1 improvements & PCRE v2 support

2017-04-19 Thread Ævar Arnfjörð Bjarmason
door to review the other bits I've changed sooner than later, so I'm sending it in the state it's in. Depending on the consensus for those two issues, fixes for those can easily be addedd on top. Comments on specific patches: Ævar Arnfjörð Bjarmason (13): Firstly, the "git grep --threads

[PATCH v2 01/13] grep: remove redundant regflags assignment under PCRE

2017-04-19 Thread Ævar Arnfjörð Bjarmason
ot;wait this is used under PCRE how?" confusion when reading the code, than to to save ourselves trivial CPU cycles by removing one assignment. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- grep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/grep.c b/grep.c index 47

Re: [PATCH] various: disallow --no-no-OPT for --no-opt options

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 19, 2017 at 4:50 AM, Jeff King wrote: > On Tue, Apr 18, 2017 at 07:40:37PM -0700, Junio C Hamano wrote: > >> > It might even be possible to detect the existing line and >> > have parse-options automatically respect "--foo" when "--no-foo" is >> > present. But that may

Re: [PATCH] various: disallow --no-no-OPT for --no-opt options

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 19, 2017 at 3:11 PM, René Scharfe <l@web.de> wrote: > Am 19.04.2017 um 09:00 schrieb Ævar Arnfjörð Bjarmason: >> >> On Wed, Apr 19, 2017 at 12:29 AM, René Scharfe <l@web.de> wrote: >>> >>> Setting PARSE_OPT_NONEG takes away the ab

Re: [BUG REPORT] git 2.9.0 clone --recursive fails on cloning a submodule

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Sun, Jun 19, 2016 at 10:51 PM, Junio C Hamano wrote: > Jeff King writes: > >> Stefan, I think it might be worth revisiting the default set by d22eb04 >> to propagate shallowness from the super-project clone. In an ideal >> world, we would be asking each

Re: [PATCH] connect.c: handle errors from split_cmdline

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 17, 2017 at 2:54 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> On Tue, Apr 11, 2017 at 12:54 PM, Jeff King <p...@peff.net> wrote: >>> On Tue, Apr 11, 2017 at 11:27:57AM +0200, Ævar A

[PATCH v2] completion: expand "push --delete " for refs on that

2017-04-22 Thread Ævar Arnfjörð Bjarmason
bash completion, and not how git-push is documented, so I'm not fixing that case, but adding a failing TODO test for it. The testing code was supplied by SZEDER Gábor in <20170421122832.24617-1-szeder@gmail.com> with minor setup modifications on my part. Signed-off-by: Ævar Arnfjörð Bjarmason

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

2017-04-21 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 21, 2017 at 4:47 PM, Michael J Gruber <g...@grubix.eu> wrote: > Ævar Arnfjörð Bjarmason venit, vidit, dixit 20.04.2017 23:58: >> As a refresh of everyone's memory (because mine needed it). This is a >> feature I added back in 2011 when the i18n support w

[PATCH] t/perf: correctly align non-ASCII descriptions in output

2017-04-21 Thread Ævar Arnfjörð Bjarmason
342e9ef2d9 ("Introduce a performance testing framework", 2012-02-17). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/perf/aggregate.perl | 3 +++ t/perf/p-perf-lib-sanity.sh | 2 ++ 2 files changed, 5 insertions(+) diff --git a/t/perf/aggregate.perl b/t

[PATCH] tests: fix tests broken under GETTEXT_POISON=YesPlease

2017-04-21 Thread Ævar Arnfjörð Bjarmason
ones. My test setup runs most of the tests, with the notable exception of skipping all the p4 tests, so it's possible that there's still some lurking regressions I haven't fixed. 1. <CACBZZX62+acvi1dpkknadTL827mtCm_QesGSZ=6+unyempg...@mail.gmail.com> Signed-off-by: Ævar Arnfjörð Bjarmason <a

Re: [BUG] test suite broken with GETTEXT_POISON=YesPlease

2017-04-21 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 21, 2017 at 4:54 PM, Lars Schneider <larsxschnei...@gmail.com> wrote: > >> Am 20.04.2017 um 23:58 schrieb Ævar Arnfjörð Bjarmason <ava...@gmail.com>: >> >> As a refresh of everyone's memory (because mine needed it). This is a >> feature I a

Re: [PATCH] t/perf: correctly align non-ASCII descriptions in output

2017-04-21 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 21, 2017 at 10:41 PM, Jeff King <p...@peff.net> wrote: > On Fri, Apr 21, 2017 at 07:44:28PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Change the test descriptions from being treated as binary blobs by >> perl to being treated as UTF-8. This ensures that e.g. a

Re: [PATCH] branch & tag: Add a --no-contains option

2017-03-09 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 1:51 PM, Jeff King <p...@peff.net> wrote: > On Thu, Mar 09, 2017 at 01:12:08PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> > I'm almost certain this is because the contains_tag_algo one doesn't >> > clean up the flag bits it sets on

[PATCH v2] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-09 Thread Ævar Arnfjörð Bjarmason
--merge & --no-merge codepaths for "tag" have a similar bug, but as of writing I can't produce any evidence of that via a brute-force test script[3]. 1. <xmqqefy71iej@gitster.mtv.corp.google.com> 2. <20170309125132.tubwxtneffok4...@sigill.intra.peff.net> 3. <cac

BUG: "git branch --contains " does nothing, silently fails

2017-03-10 Thread Ævar Arnfjörð Bjarmason
Ran into this when preparing my --no-contains series, this is a long standing bug: $ ./git branch -D test; ./git branch --contains v2.8.0 test; echo $?; git rev-parse test error: branch 'test' not found. 0 test fatal: ambiguous argument 'test': unknown revision or path not in

Re: [PATCH] branch & tag: Add a --no-contains option

2017-03-09 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 11:09 AM, Jeff King <p...@peff.net> wrote: > On Wed, Mar 08, 2017 at 08:20:25PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Change the branch & tag commands to have a --no-contains option in >> addition to their longstanding --contains option

[PATCH] branch & tag: Add a --no-contains option

2017-03-08 Thread Ævar Arnfjörð Bjarmason
e are just doing the inverse of the existing --contains tests, with this --no-contains for both tag & branch should be just as tested as the existing --contains option. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-branch.txt | 2

Re: [PATCH] branch & tag: Add a --no-contains option

2017-03-09 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 11:46 AM, Jeff King <p...@peff.net> wrote: > On Thu, Mar 09, 2017 at 11:41:59AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> > I almost suggested that there simply be an option to invert the match >> > (like --invert-contains or something).

Re: [PATCH 4/4] ref-filter: use separate cache for contains_tag_algo

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 2:29 PM, Jeff King wrote: > [...] > @@ -1874,6 +1886,8 @@ int filter_refs(struct ref_array *array, struct > ref_filter *filter, unsigned int > broken = 1; > filter->kind = type & FILTER_REFS_KIND_MASK; > > +

[PATCH v4] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-11 Thread Ævar Arnfjörð Bjarmason
_algo" patch to do that for filter->with_commit as well. 1. <xmqqefy71iej@gitster.mtv.corp.google.com> 2. <20170309125132.tubwxtneffok4...@sigill.intra.peff.net> Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- This is now based on top of pu, which h

Re: How to view diff when doing `git push --force`

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 11, 2017 at 3:52 PM, KES wrote: > Hi. I have done `git push --force` but I forget to `pull`, > > Counting objects: 7, done. > Delta compression using up to 4 threads. > Compressing objects: 100% (7/7), done. > Writing objects: 100% (7/7), 765 bytes | 0 bytes/s,

Re: [PATCH 4/4] ref-filter: use separate cache for contains_tag_algo

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 11, 2017 at 9:01 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Thu, Mar 9, 2017 at 2:29 PM, Jeff King <p...@peff.net> wrote: >> [...] >> @@ -1874,6 +1886,8 @@ int filter_refs(struct ref_array *array, struct >> ref_filter *filter, unsigned

Re: BUG: "git branch --contains " does nothing, silently fails

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 10, 2017 at 1:42 PM, Jeff King <p...@peff.net> wrote: > On Fri, Mar 10, 2017 at 11:43:15AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> Ran into this when preparing my --no-contains series, this is a long >> standing bug: >> >> $ ./git branch -D

Re: Stable GnuPG interface, git should use GPGME

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 10, 2017 at 11:00 AM, Bernhard E. Reiter wrote: > Dear Git-Devs, I haven't contributed to Git's GPG code, but I'm taking the liberty of CC-ing some people who have. > git uses an pipe-and-exec approach to running a GnuPG binary > as writen in the

Re: [PATCH] tag: Implicitly supply --list given another list-like option

2017-03-12 Thread Ævar Arnfjörð Bjarmason
On Sun, Mar 12, 2017 at 4:19 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change these invocations which currently error out without the -l, to >> behave as if though -l was provided: >> &g

Re: [PATCH] tag: Implicitly supply --list given another list-like option

2017-03-12 Thread Ævar Arnfjörð Bjarmason
On Sun, Mar 12, 2017 at 3:51 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >>> Junio: This will merge conflict with my in-flight --no-contains >>> patch. I can re-send either one depending on which you

Re: [PATCH v4] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-12 Thread Ævar Arnfjörð Bjarmason
On Sun, Mar 12, 2017 at 5:44 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> Change the tag, branch & for-each-ref commands to have a --no-contains >> option in addition to their longstanding --contains

Re: [RFC][PATCH] index-pack: add testcases found using AFL

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 10, 2017 at 8:06 PM, Jeff King wrote: > [Note: your original email didn't make it to the list because it's over > 100K; I'll quote liberally]. > > On Fri, Mar 10, 2017 at 04:15:56PM +0100, Vegard Nossum wrote: > >> I've used AFL to generate a corpus of pack files that

[PATCH v3] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-10 Thread Ævar Arnfjörð Bjarmason
--merge & --no-merge codepaths for "tag" have a similar bug, but as of writing I can't produce any evidence of that via a brute-force test script[3]. 1. <xmqqefy71iej@gitster.mtv.corp.google.com> 2. <20170309125132.tubwxtneffok4...@sigill.intra.peff.net> 3. <cac

Re: [PATCH v2] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 10, 2017 at 12:46 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Thu, Mar 9, 2017 at 9:31 PM, Christian Couder > <christian.cou...@gmail.com> wrote: >> On Thu, Mar 9, 2017 at 9:02 PM, Ævar Arnfjörð Bjarmason >> <ava...@gmail.com> wrote

Re: [PATCH] branch & tag: Add a --no-contains option

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 3:55 PM, Jeff King <p...@peff.net> wrote: > On Thu, Mar 09, 2017 at 03:52:09PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> - filter->with_commit_tag_algo = 1; >> + if ((filter->merge_commit + filter->with_c

Re: [PATCH v2] ref-filter: Add --no-contains option to tag/branch/for-each-ref

2017-03-10 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 9:31 PM, Christian Couder <christian.cou...@gmail.com> wrote: > On Thu, Mar 9, 2017 at 9:02 PM, Ævar Arnfjörð Bjarmason > <ava...@gmail.com> wrote: >> >> diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt >>

[PATCH] tag: Implicitly supply --list given another list-like option

2017-03-11 Thread Ævar Arnfjörð Bjarmason
attern. I've changed the failing tests to check that this invocation mode is permitted instead, and added extra tests for the list-like options we weren't testing. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Junio: This will merge conflict with my in-flight --no-contains

Re: [PATCH] tag: Implicitly supply --list given another list-like option

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 11, 2017 at 1:08 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > Change these invocations which currently error out without the -l, to > behave as if though -l was provided: > > git tag -l [--contains|--points-at|--[no-]merged] Oops, this should b

Re: How to find the cause of 'git push' stopping on 'Writing objects'?

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Sat, Mar 11, 2017 at 12:55 PM, Luuk wrote: > I am new to GIT, so i'm playing around with a repository and git is hanging > on 'git push', > How can i find out what i'm doing wrong here? > > D:\TEMP\test\test>git remote -v > origin git://mini/test.git (fetch) > origin

Re: [PATCH v2] repack: Add option to preserve and prune old pack files

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Fri, Mar 10, 2017 at 11:00 PM, James Melvin wrote: > The new --preserve-and-prune option renames old pack files > instead of deleting them after repacking and prunes previously > preserved pack files. I think some of this rationale... > This option is designed to

Re: [PATCH 0/4] fix object flag pollution in "tag --contains"

2017-03-11 Thread Ævar Arnfjörð Bjarmason
On Thu, Mar 9, 2017 at 2:27 PM, Jeff King wrote: > On Thu, Mar 09, 2017 at 07:51:32AM -0500, Jeff King wrote: > >> Looking at this, I'm pretty sure that using "--contains" with "--merged" >> has similar problems, as they both use the UNINTERESTING bit. So even >> without your

[PATCH v2 2/2] gitweb tests: Skip tests when we don't have Time::HiRes

2017-03-01 Thread Ævar Arnfjörð Bjarmason
not installed along with /usr/bin/perl by default. Without this we'll hard fail the gitweb tests when trying to load the module. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/gitweb-lib.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh

Re: [PATCH/RFC] gitperformance: add new documentation about git performance tuning

2017-04-03 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 3, 2017 at 11:34 PM, Eric Wong <e...@80x24.org> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >> Add a new manpage that gives an overview of how to tweak git's >> performance. >> >> There's currently no good single resource for things

Re: Very promising results with libpcre2

2017-04-01 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 1, 2017 at 8:24 PM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> On Sat, Apr 1, 2017 at 12:48 AM, Junio C Hamano <gits...@pobox.com> wrote: >>> Ævar Arnfjörð Bjarmason <ava...@gmail.com&

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

2017-04-08 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 8, 2017 at 4:15 AM, Matt McCutchen wrote: > When I'm rewriting history, "git push --force-with-lease" is a nice > safeguard compared to "git push --force", but it still assumes the > remote-tracking ref gives the old state the user wants to overwrite. > Tools

[PATCH] push: document & test --force-with-lease with multiple remotes

2017-04-08 Thread Ævar Arnfjörð Bjarmason
Jakub Narębski suggested this method of adding another remote to bypass this edge case, document that & add a test for it. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- On Sat, Apr 8, 2017 at 11:29 AM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 09:3

[PATCH 00/12] PCREv2 & more

2017-04-08 Thread Ævar Arnfjörð Bjarmason
This adds PCRE v2 support, but as I was adding that I kept noticing other related problems to fix. It's all bundled up into the same series because much of it conflicts because it modifies the same test or other code. Notes on each patch below. Ævar Arnfjörð Bjarmason (12): grep: add ability

[PATCH 10/12] grep: change the internal PCRE macro names to be PCRE1

2017-04-08 Thread Ævar Arnfjörð Bjarmason
code and the USE_LIBPCRE Makefile argument was added in commit 63e7e9d8b6 ("git-grep: Learn PCRE", 2011-05-09). At the time there was no indication that the PCRE project would release an entirely new & incompatible API around 3 years later. Signed-off-by: Ævar Arnfjörð Bjarmason

[PATCH 12/12] grep: add support for PCRE v2

2017-04-08 Thread Ævar Arnfjörð Bjarmason
Add support for v2 of the PCRE API. This is a new major version of PCRE that came out in early 2015[1]. The regular expression syntax is the same, but while similar-ish requires a different codepath to support it. Git can now be compiled with any combination of USE_LIBPCRE=[YesPlease|] &

[PATCH 06/12] log: add -P as a synonym for --perl-regexp

2017-04-08 Thread Ævar Arnfjörð Bjarmason
ed in the aforementioned commit the --basic-regexp option can't have a corresponding -G argument, as the log command already uses that for -G. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/rev-list-options.txt | 1 + revision.c

[PATCH 04/12] grep: add a test for backreferences in PCRE patterns

2017-04-08 Thread Ævar Arnfjörð Bjarmason
Add a test for backreferences such as (.)\1 in PCRE patterns. This test ensures that the PCRE_NO_AUTO_CAPTURE option isn't turned on. Before this change turning it on would break these sort of patterns, but wouldn't break any tests. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com>

[PATCH 02/12] grep: remove redundant regflags assignment under PCRE

2017-04-08 Thread Ævar Arnfjörð Bjarmason
ot;wait this is used under PCRE how?" confusion when reading the code, than to to save ourselves trivial CPU cycles by removing one assignment. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- grep.c | 1 - 1 file changed, 1 deletion(-) diff --git a/grep.c b/grep.c index 56

[PATCH 05/12] log: add exhaustive tests for pattern style options & config

2017-04-08 Thread Ævar Arnfjörð Bjarmason
matching method than the one it's told to use. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t4202-log.sh | 67 +- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 48b

[PATCH 09/12] test-lib: rename the LIBPCRE prerequisite to PCRE

2017-04-08 Thread Ævar Arnfjörð Bjarmason
e general name to make it clear that they work on both library versions. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/README| 4 ++-- t/t4202-log.sh | 10 +- t/t7810-grep.sh | 30 +++--- t/

[PATCH 11/12] grep: change the internal PCRE code & header names to be PCRE1

2017-04-08 Thread Ævar Arnfjörð Bjarmason
tions behind this commit. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 4 ++-- grep.c | 56 grep.h | 10 +- revision.c | 2 +- 4 files changed, 36 insertions(+), 36 dele

[PATCH 07/12] grep & rev-list doc: stop promising libpcre for --perl-regexp

2017-04-08 Thread Ævar Arnfjörð Bjarmason
he --perl-regexp option by default, depending on how Git is compiled. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-grep.txt | 4 ++-- Documentation/rev-list-options.txt | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Docume

[PATCH 08/12] grep: make grep.patternType=[pcre|pcre1] a synonym for "perl"

2017-04-08 Thread Ævar Arnfjörð Bjarmason
uot;pcre2" instead of "pcre1", and depending on how Git is compiled the more specific "pcre1" or "pcre2" pattern types might produce an error. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/config.txt | 9 + grep.c

[PATCH 03/12] Makefile & configure: reword outdated comment about PCRE

2017-04-08 Thread Ævar Arnfjörð Bjarmason
at this enables user-initiated runtime behavior. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Makefile | 6 -- configure.ac | 12 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 9b36068ac5..23945d87cf 100644 ---

[PATCH 01/12] grep: add ability to disable threading with --threads=0 or grep.threads=0

2017-04-08 Thread Ævar Arnfjörð Bjarmason
03-15). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-grep.txt | 4 ++-- builtin/grep.c | 26 ++ t/t7810-grep.sh| 10 ++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/Documentatio

Re: [RFC] dropping support for ancient versions of curl

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 11:33 AM, Tom G. Christensen wrote: > On 04/04/17 04:54, Jeff King wrote: >> >> A nearby thread raised the question of whether we can rely on a version >> of libcurl that contains a particular feature. The version in question >> is curl 7.11.1, which

Re: Tools that do an automatic fetch defeat "git push --force-with-lease"

2017-04-08 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 8, 2017 at 5:03 PM, Stefan Haller wrote: > Matt McCutchen wrote: > >> When I'm rewriting history, "git push --force-with-lease" is a nice >> safeguard compared to "git push --force", but it still assumes the >> remote-tracking ref gives

Re: [PATCH 4/6] receive-pack: quarantine objects until pre-receive accepts

2017-04-08 Thread Ævar Arnfjörð Bjarmason
On Sat, Oct 1, 2016 at 11:12 AM, Jeff King wrote: > On Fri, Sep 30, 2016 at 03:36:30PM -0400, Jeff King wrote: > >> @@ -1639,6 +1666,18 @@ static const char *unpack(int err_fd, struct >> shallow_info *si) >> argv_array_push(, alt_shallow_file); >> } >> >> +

Re: Feature request: --format=json

2017-04-08 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 8, 2017 at 6:07 PM, Fred .Flintstone wrote: > $ git log --format=json > [{ > "commit": "64eabf050e315a4c7a11e0c05ca163be7cf9075e", > "tree": "b1e977800f40bbf6de906b1fe4f2de4b4b14f0fd", > "author": "Tux 1490981516 +0200", >

Is there a way to get 'git fetch --no-tags' semantics with 'git clone'?

2017-04-14 Thread Ævar Arnfjörð Bjarmason
As far as I can tell the only way to clone a given upstream repo, which has an unknown main branch name without any tags is: git clone --single-branch && cd && git tag -d $(git tag -l) && git config remote.origin.tagOpt --no-tags Is there really nothing like: git clone

[PATCH] clone: add a --no-tags option to clone without tags

2017-04-18 Thread Ævar Arnfjörð Bjarmason
thout --single-branch to clone a repository without tags. Before this the only way of doing this was either by manually tweaking the config in a fresh repository: git init git && cat >git/.git/config < --- On Fri, Apr 14, 2017 at 11:28 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.c

Re: [PATCH] various: disallow --no-no-OPT for --no-opt options

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 19, 2017 at 12:29 AM, René Scharfe <l@web.de> wrote: > Am 18.04.2017 um 19:09 schrieb Ævar Arnfjörð Bjarmason: >> >> Change various --no-OPT options which don't supply PARSE_OPT_NONEG to >> make --no-no-OPT an error. >> >> All of these worked

Re: [PATCH] clone: add a --no-tags option to clone without tags

2017-04-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 18, 2017 at 9:15 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > N_("clone only one branch, HEAD or --branch")), > + OPT_BOOL_NONEG(0, "no-tags", _no_tags, > + N_("don't clone any t

[PATCH v2] push: document & test --force-with-lease with multiple remotes

2017-04-19 Thread Ævar Arnfjörð Bjarmason
read for more details. Jakub Narębski suggested this method of adding another remote to bypass this edge case, document that & add a test for it. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- On Mon, Apr 17, 2017 at 5:56 AM, Junio C Hamano <gits...@pobox.com> wrote:

Re: [RFC PATCH] parse-options: disallow double-negations of options starting with no-

2017-04-19 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 19, 2017 at 11:08 AM, Jacob Keller wrote: > Many options can be negated by prefixing the option with "no-", for > example "--3way" can be prefixed with "--no-3way" to disable it. Since > 0f1930c58754 ("parse-options: allow positivation of options > starting,

Re: [PATCH 0/2] perf: show that wildmatch() regressed for pathological cases in v2.0

2017-04-24 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 24, 2017 at 11:34 PM, Brandon Williams wrote: > On 04/24, Ęvar Arnfjörš Bjarmason wrote: >> Russ Cox just published an article about how various glob() >> implementations suffer from pathological performance when fed certain >> pathological patterns like "a*a*a*a*b"

Re: [PATCH] hash: Allow building with the external sha1dc library

2017-07-28 Thread Ævar Arnfjörð Bjarmason
On Tue, Jul 25, 2017 at 7:57 AM, Takashi Iwai wrote: > Some distros provide SHA1 collision detect code as a shared library. > It's the very same code as we have in git tree, and git can link with > it as well; at least, it may make maintenance easier, according to our > security

Re: [PATCH] hash: Allow building with the external sha1dc library

2017-07-28 Thread Ævar Arnfjörð Bjarmason
On Fri, Jul 28, 2017 at 5:58 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > On Tue, Jul 25, 2017 at 7:57 AM, Takashi Iwai <ti...@suse.de> wrote: >> Some distros provide SHA1 collision detect code as a shared library. >> It's the very same code as we have in

Re: [PATCH 2/2] t6500: mark tests as SHA1 reliant

2017-07-31 Thread Ævar Arnfjörð Bjarmason
On Mon, Jul 31, 2017 at 1:24 AM, brian m. carlson wrote: > On Sun, Jul 30, 2017 at 11:00:19PM +, brian m. carlson wrote: >> Yes, basically, but a bit more generally. There will always be cases in >> which we need to specify an object ID or an arbitrary string

Re: [PATCH] hash: Allow building with the external sha1dc library

2017-08-01 Thread Ævar Arnfjörð Bjarmason
On Tue, Aug 01 2017, Takashi Iwai jotted: > On Tue, 01 Aug 2017 17:56:00 +0200, > Junio C Hamano wrote: >> >> Takashi Iwai <ti...@suse.de> writes: >> >> > On Fri, 28 Jul 2017 17:58:14 +0200, >> > Ævar Arnfjörð Bjarmason wrote: >> >>

Re: [PATCH] push: disable lazy --force-with-lease by default

2017-07-07 Thread Ævar Arnfjörð Bjarmason
On Thu, Jul 06 2017, Junio C. Hamano jotted: > "git push --force-with-lease=:" makes sure that > there is no unexpected changes to the branch at the remote while you > prepare a rewrite based on the old state of the branch. This > feature came with an experimental option that allows : part > to

Re: [PATCH] push: disable lazy --force-with-lease by default

2017-07-07 Thread Ævar Arnfjörð Bjarmason
On Fri, Jul 07 2017, Stefan Haller jotted: > Junio C Hamano wrote: > >> It turns out that some people use third-party tools that fetch from >> remote and update the remote-tracking branches behind users' back, >> defeating the safety relying on the stability of the

<    1   2   3   4   5   6   7   8   9   10   >