[PATCH v2 14/16] ref-filter: reflow recently changed branch/tag/for-each-ref docs

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Reflow the recently changed branch/tag-for-each-ref documentation. This change shows no changes under --word-diff, except the innocuous change of moving git-tag.txt's "[--sort=]" around slightly. --- Documentation/git-branch.txt | 15 --- Documentation/git-tag.txt| 7 --- 2

[PATCH v2 15/16] tag: implicitly supply --list given the -n option

2017-03-21 Thread Ævar Arnfjörð Bjarmason
possibility for more confusion, since instead of the latter of these dying: git tag -n100 git tag -n 100 It now works entirely differently, i.e. invokes list mode with a filter for "100" as a pattern. I.e. it's synonymous with: git tag -n --list 100 Signed-off-by: Æ

[PATCH v2 03/16] tag doc: reword --[no-]merged to talk about commits, not tips

2017-03-21 Thread Ævar Arnfjörð Bjarmason
9-10). Talking about the "tip" is branch nomenclature, not something usually associated with tags. This phrasing might lead the reader to believe that these options might find tags pointing to trees or blobs, let's instead be explicit and only talk about commits. Signed-off-by: Ævar Arnfjörð B

[PATCH v2 12/16] tag: change --point-at to default to HEAD

2017-03-21 Thread Ævar Arnfjörð Bjarmason
ac (tag: add --points-at list option, 2012-02-08). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-tag.txt | 3 ++- builtin/tag.c | 3 ++- t/t7004-tag.sh| 9 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Docu

[PATCH v2 16/16] tag: add tests for --with and --without

2017-03-21 Thread Ævar Arnfjörð Bjarmason
-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7004-tag.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index 60b5cd8751..8cd611344f 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -1596,7 +1596,7 @@ test_expect_success '

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

2017-03-21 Thread Ævar Arnfjörð Bjarmason
dd a test for "tag" which asserts that --no-contains won't find tree/blob tags, which is slightly unintuitive, but consistent with how --contains works & is documented. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-branch.txt | 16 ++

[PATCH v2 05/16] ref-filter: add test for --contains on a non-commit

2017-03-21 Thread Ævar Arnfjörð Bjarmason
between "branch" and "for-each-ref". Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t3201-branch-contains.sh | 9 + t/t7004-tag.sh | 4 +++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/t/t3201-branch-contains.sh b/t/t3201-br

[PATCH v2 02/16] tag doc: split up the --[no-]merged documentation

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Split up the --[no-]merged documentation into documentation that documents each option independently. This is in line with how "branch" and "for-each-ref" are documented, and makes subsequent changes to discuss the limits & caveats of each option easier to read. Sign

[PATCH v2 06/16] tag: remove a TODO item from the test suite

2017-03-21 Thread Ævar Arnfjörð Bjarmason
this point changing this would be inconsistent with how "git tag" is a synonym for "git tag -l", and would needlessly break external code that relies on this porcelain command. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7004-tag.sh | 2 -- 1 file change

[PATCH v2 11/16] tag: implicitly supply --list given another list-like option

2017-03-21 Thread Ævar Arnfjörð Bjarmason
t would allow: git tag -n 100 As a synonym for: git tag -n --list 100 Which, while not technically ambiguous as the option must already be provided as -n rather than -n , would be confusing. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-tag.txt | 8 ++-

[PATCH v2 04/16] ref-filter: make combining --merged & --no-merged an error

2017-03-21 Thread Ævar Arnfjörð Bjarmason
ning. Making its cousins have different behavior in this regard would be confusing to the user, especially since we'd be silently disregarding some of their command-line input. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-branch.txt | 6 -- Documen

[PATCH v2 08/16] for-each-ref: partly change to in help

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Change mentions of to in the help output of for-each-ref as appropriate. Both --[no-]merged and --contains only take commits, but --points-at can take any object, such as a tag pointing to a tree or blob. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/for-each-ref

[PATCH v2 09/16] tag: add more incompatibles mode tests

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Amend the test suite to test for more invalid uses like "-l -a" etc. This mainly tests the `(argc == 0 && !cmdmode)` -> `((create_tag_object || force) && (cmdmode != 0))` code path in builtin/tag.c. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gma

[PATCH v2 10/16] tag: change misleading --list documentation

2017-03-21 Thread Ævar Arnfjörð Bjarmason
option", 2011-08-28). Change the test suite to assert that these invocations work for the cases that weren't already being tested for. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-tag.txt | 16 +--- t/t7004-tag.sh| 21

[PATCH v2 07/16] tag tests: fix a typo in a test description

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Change "suceed" to "succeed" in a test description. The typo has been here since the code was originally added in commit ef5a6fb597 ("Add test-script for git-tag", 2007-06-28). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7004-tag.sh | 2 +

[PATCH v2 00/16] Various changes to the "tag" command & related

2017-03-21 Thread Ævar Arnfjörð Bjarmason
think it's easier to bundle it up. Comments on individual patches below: Ævar Arnfjörð Bjarmason (16): tag doc: move the description of --[no-]merged earlier tag doc: split up the --[no-]merged documentation tag doc: reword --[no-]merged to talk about commits, not tips NEW: Document

Re: [PATCH] l10n: add framework for localizing the manpages

2017-03-14 Thread Ævar Arnfjörð Bjarmason
On Mon, Mar 13, 2017 at 1:01 AM, Junio C Hamano wrote: > Jean-Noel Avila writes: Jean: Comments on the patch: - Firstly thanks for working on this. When I hacked up the initial po support in v1.7.8-rc2-1-g5e9637c629 I always meant to try out po4a, but never

[PATCH 0/8] Various changes to the "tag" command

2017-03-18 Thread Ævar Arnfjörð Bjarmason
as pointed out by Junio in <xmqqwpbvumrk@gitster.mtv.corp.google.com>. I think it makes sense to have that, but in the interest of getting something out the door I'm not working on that for now. Ævar Arnfjörð Bjarmason (8): tag: Remove a TODO item from the test suite tag: Refactor

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

2017-03-18 Thread Ævar Arnfjörð Bjarmason
t would allow: git tag -n 100 As a synonym for: git tag -n --list 100 Which, while not technically ambiguous as the option must already be provided as -n rather than -n , would be confusing. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Docum

[PATCH 3/8] tag: Change misleading --list documentation

2017-03-18 Thread Ævar Arnfjörð Bjarmason
option", 2011-08-28). Change the test suite to assert that these invocations work for the cases that weren't already being tested for. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-tag.txt | 16 +--- t/t7004-tag.sh| 21

[PATCH 7/8] tag: Add tests for --with and --without

2017-03-18 Thread Ævar Arnfjörð Bjarmason
Change the test suite to test for these options. Before this change there were no tests for this at all. This change doesn't exhaustively test for them as well as their --contains and --no-contains aliases, but at least it's something. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.

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

2017-03-18 Thread Ævar Arnfjörð Bjarmason
" which asserts that --no-contains won't find tree/blob tags, which is slightly unintuitive, but consistent with how --contains works & is documented. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-branch.txt | 15 ++-- Documentati

[PATCH 8/8] tag: Change --point-at to default to HEAD

2017-03-18 Thread Ævar Arnfjörð Bjarmason
Change the --points-at option to default to HEAD for consistency with its siblings --contains, --merged etc. which default to HEAD. This changes behavior added in commit ae7706b9ac (tag: add --points-at list option, 2012-02-08). Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.

[PATCH 1/8] tag: Remove a TODO item from the test suite

2017-03-18 Thread Ævar Arnfjörð Bjarmason
this point changing this would be inconsistent with how "git tag" is a synonym for "git tag -l", and would needlessly break external code that relies on this porcelain command. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7004-tag.sh | 2 -- 1 file change

[PATCH 5/8] tag: Implicitly supply --list given the -n option

2017-03-18 Thread Ævar Arnfjörð Bjarmason
ility for more confusion since instead of the latter of these dying: git tag -n100 git tag -n 100 It now works entirely differently, i.e. invokes list mode with a filter for "100". Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-tag.txt | 9 +

[PATCH 2/8] tag: Refactor the options handling code to be less bizarro

2017-03-18 Thread Ævar Arnfjörð Bjarmason
opriate mode, 2008-11-05), to its present form in commit e6b722db09 ("tag: use OPT_CMDMODE", 2013-07-30). Change the test suite to more exhaustively assert that already existing behavior related to this option parsing is kept. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com&

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

2017-03-20 Thread Ævar Arnfjörð Bjarmason
On Mon, Mar 20, 2017 at 5:25 AM, Jeff King <p...@peff.net> wrote: > On Sat, Mar 18, 2017 at 10:32:54AM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Change the tag, branch & for-each-ref commands to have a --no-contains >> option in addition to their longstanding --contain

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

2017-03-20 Thread Ævar Arnfjörð Bjarmason
On Mon, Mar 20, 2017 at 4:55 AM, Jeff King <p...@peff.net> wrote: > On Sat, Mar 18, 2017 at 10:32:52AM +0000, Ævar Arnfjörð Bjarmason wrote: > >> With this change errors messages such as "--contains option is only >> allowed with -l" don't make sense anymore, si

Re: [PATCH 3/8] tag: Change misleading --list documentation

2017-03-20 Thread Ævar Arnfjörð Bjarmason
On Mon, Mar 20, 2017 at 4:44 AM, Jeff King wrote: > On Sat, Mar 18, 2017 at 11:43:47AM -0700, Junio C Hamano wrote: > >> > +test_expect_success 'Multiple -l or --list options are equivalent to one >> > -l option' ' >> > + git tag -l -l >actual && >> > + test_cmp expect actual

[PATCH] doc: change erroneous --[no]-whatever into --[no-]whatever

2017-03-20 Thread Ævar Arnfjörð Bjarmason
Change these two obvious typos to be in line with the rest of the documentation, which uses the correct --[no-]whatever form. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-format-patch.txt | 2 +- Documentation/git-send-email.txt | 2 +- 2 files chan

Re: [PATCH 00/20] Separate `ref_cache` into a separate module

2017-03-20 Thread Ævar Arnfjörð Bjarmason
On Mon, Mar 20, 2017 at 5:33 PM, Michael Haggerty wrote: > I've completed a draft of an epic 48-patch series implementing all of > the above points on my GitHub fork [1] as branch > `wip/mmap-packed-refs`. It dramatically speeds up performance and > reduces memory usage for

[PATCH v2 1/2] doc/SubmittingPatches: clarify the casing convention for "area: change..."

2017-03-21 Thread Ævar Arnfjörð Bjarmason
tar" is not a common word, and "git-cherry-pick.txt" is a much longer string than "githooks.txt". Pick two recent commits from git.git that fit better for the description. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/SubmittingPatches | 9

[PATCH v2 2/2] doc/SubmittingPatches: show how to get a CLI commit summary

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Amend the section which describes how to get a commit summary to show how do to that with "git show", currently the documentation only shows how to do that with gitk. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/SubmittingPatches | 11 ++-

[PATCH v2 0/2] A couple of minor improvements

2017-03-21 Thread Ævar Arnfjörð Bjarmason
Unchanged from v1 in my <20170318184203.16890-1-ava...@gmail.com>, except 2/2 changes the "show" command to use --date=short as Junio suggested in <xmqq37ea2ykh@gitster.mtv.corp.google.com>. Ævar Arnfjörð Bjarmason (2): doc/SubmittingPatches: clarify the casin

BUG: "git revert -m 0 " considered to be "git revert "

2017-03-14 Thread Ævar Arnfjörð Bjarmason
Both of these emit the "is a merge but no -m option was given" when is a merge. I tried to track this down for a bit in the options parsing code but couldn't see where it was happening, but at some point we're setting opts->mainline to 0 both when it's not provided, and when it's explicitly

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

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 12:39 AM, Eric Wong <e...@80x24.org> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >> On Mon, Apr 3, 2017 at 11:34 PM, Eric Wong <e...@80x24.org> wrote: >> > Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: >> >

Re: [PATCH v4 2/4] fsck: force core.checksumindex=1

2017-04-03 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 3, 2017 at 8:53 PM, wrote: > Teach fsck to override core.checksumindex and always verify > the index checksum when reading the index. Sorry to only chime in about this at v4. I think this patch & the documentation you added for core.checksumindex in 1/4

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

2017-04-09 Thread Ævar Arnfjörð Bjarmason
On Sun, Apr 9, 2017 at 11:55 AM, Simon Ruderich <si...@ruderich.org> wrote: > Hello, > > I like the documentation update and test. > > On Sat, Apr 08, 2017 at 11:41:00AM +, Ævar Arnfjörð Bjarmason wrote: >> [snip] >> >> ++ >> +Now when

Re: [PATCH 0/3] quarantine-push loose ends

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:10 AM, Jeff King wrote: > On Mon, Apr 10, 2017 at 05:14:24PM -0400, Jeff King wrote: > >> > Also, I think this whole thing could really do with some documentation >> > in githooks(5). E.g. what hooks does it apply for? The test is just >> > for

Re: [PATCH 2/2] test-lib: exhaustively insert non-alnum ASCII into the TRASH_DIRECTORY name

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Sun, Apr 9, 2017 at 9:11 PM, Ævar Arnfjörð Bjarmason <ava...@gmail.com> wrote: > Change the test library to insert non-alphanumeric ASCII characters > into the TRASH_DIRECTORY name, that's the directory the test library > creates, chdirs to and runs each individual test from. I

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu wrote: >> Well, what do you suggest as an alternative? >> >> Git tells you that you are in detached state and where you came from >> (detached from). > > I think it'd be best if git status somehow indicated that you're no >

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 10:34 PM, Jeff King <p...@peff.net> wrote: > On Tue, Apr 11, 2017 at 10:20:59PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> I'm struggling to find a use-case where threading makes sense at all. >> The example in the initial introduction in 5b5

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:06 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 01:24:55PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Add the ability to entirely disable threading by having grep.threads=0 >> in the config or --threads=0 on the command-l

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 6:51 PM, Brandon Williams wrote: > On 04/11, Jeff King wrote: >> On Tue, Apr 11, 2017 at 01:02:56PM +0200, Ęvar Arnfjörš Bjarmason wrote: >> >> > >> Yes, this is a bug. I'll need to add a git_options along with >> > >> submodule_options and pass -c

Re: [PATCH v4 2/4] fsck: force core.checksumindex=1

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 4:29 AM, Jeff King <p...@peff.net> wrote: > On Mon, Apr 03, 2017 at 10:31:03PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Apr 3, 2017 at 8:53 PM, <g...@jeffhostetler.com> wrote: >> > Teach fsck to override core.checksumindex and alwa

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

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 4:54 AM, Jeff King wrote: > My feeling is that this is old enough to stop caring about. Which means > we can drop some of the #ifdefs that clutter the HTTP code (and there's > a patch at the end of this mail dropping support for everything older > than

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

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 10:33 AM, Jeff King <p...@peff.net> wrote: > On Tue, Apr 04, 2017 at 10:17:51AM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Apr 4, 2017 at 4:54 AM, Jeff King <p...@peff.net> wrote: >> > My feeling is that this is old enough to stop

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

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 1:54 PM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi, > > On Tue, 4 Apr 2017, Ævar Arnfjörð Bjarmason wrote: > >> I think it's completely fine to include your patch as-is. At some >> point we need to pass the burden of d

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

2017-04-04 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 4, 2017 at 5:07 PM, Jeff Hostetler <g...@jeffhostetler.com> wrote: > > On 4/3/2017 5:16 PM, Ævar Arnfjörð Bjarmason wrote: >> >> Add a new manpage that gives an overview of how to tweak git's >> performance. >> >> There's currently no

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

2017-04-03 Thread Ævar Arnfjörð Bjarmason
ight want to look at when investigating ways to improve git performance. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- I've been wanting to get something like this started for a while. It's obviously woefully incomplete. Pointers about what to include would be great & whe

Very promising results with libpcre2

2017-03-31 Thread Ævar Arnfjörð Bjarmason
The recent libpcre2 got me interested in seeing what the difference in v1 and v2 was. So I hacked up a *very basic* patch for libpcre2 that passes all tests, but obviously isn't ready for inclusion (I searched/replaced all the v1 usage with v2). I'm not even bothering sending this to the list

Re: Very promising results with libpcre2

2017-04-01 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 1, 2017 at 12:48 AM, Junio C Hamano <gits...@pobox.com> wrote: > Ævar Arnfjörð Bjarmason <ava...@gmail.com> writes: > >> That enables the new JIT support in pcre v2: >> >> s/iterrx fixed prx >> rx 2.19-- -33% -44% >>

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 12, 2017 at 3:11 PM, Michael J Gruber <g...@grubix.eu> wrote: > Ævar Arnfjörð Bjarmason venit, vidit, dixit 12.04.2017 14:18: >> On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber <g...@grubix.eu> wrote: >>> Am 11. April 2017 22:40:14 MESZ schrieb "

Re: `git status` output is very misleading after a merge on a "detached HEAD"

2017-04-12 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 12, 2017 at 7:43 AM, Michael J Gruber <g...@grubix.eu> wrote: > Am 11. April 2017 22:40:14 MESZ schrieb "Ævar Arnfjörð Bjarmason" > <ava...@gmail.com>: >>On Tue, Apr 11, 2017 at 5:13 PM, Enis Bayramoğlu >>> HEAD detached from origin/maste

Re: how-to get commit content with pre-receive hook ?

2017-04-06 Thread Ævar Arnfjörð Bjarmason
On Thu, Apr 6, 2017 at 4:03 PM, Eric Belhomme wrote: > Until now I ever had a quite "basic" Git usage, but now I'm working on a > project based on Git hooks feature.. and I'm a very beginner with Git hooks > ! > > My need consist doing a syntax check on submitted files

Re: [PATCH 6/7] Handle missing CURLINFO_SSL_DATA_{IN,OUT}

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen wrote: > Do not try and use CURLINFO_SSL_DATA_{IN,OUT} for curl < 7.12.1. Disables code added by Elia Pinto in 74c682d3c6. Looks harmless to me since it's just omitting some information when GIT_TRACE_CURL is set. >

Re: [PATCH 4/7] Handle missing HTTP_CONNECTCODE in curl < 7.10.7

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen wrote: > With curl < 7.10.7 we cannot get the proxy CONNECT response code. > As a workaround set it to zero which means no response code available. CC-ing Knut Franke which added this code in

Re: [PATCH 7/7] Do not use curl_easy_strerror with curl < 7.12.0

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen wrote: > Commit 17966c0a added an unguarded use of curl_easy_strerror. > This adds a guard so it is not used with curl < 7.12.0. Looks good to me. Eric Wong added this in 17966c0a63. > Signed-off-by: Tom G. Christensen

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

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen wrote: > This adds an OLD_GNUPG define to the Makefile which when activated will > ensure git does not use the --keyid-format argument when calling the > 'gpg' program. > This is consistent with how 'gpg' was used in git <

Re: [PATCH 3/7] Allow svnrdump_sim.py to be used with Python 2.2

2017-04-05 Thread Ævar Arnfjörð Bjarmason
On Wed, Apr 5, 2017 at 3:04 PM, Tom G. Christensen wrote: > This allows running the git-svn testsuite with Python 2.2. +CC-ing Eric S. Raymond who added these version limitations in a33faf2827. Also, in his patch contrib/svn-fe/svnrdump_sim.py,

Re: [PATCH 2/2] test-lib: exhaustively insert non-alnum ASCII into the TRASH_DIRECTORY name

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 10, 2017 at 3:47 AM, SZEDER Gábor wrote: >> Change the test library to insert non-alphanumeric ASCII characters >> into the TRASH_DIRECTORY name, that's the directory the test library >> creates, chdirs to and runs each individual test from. >> >> Unless

[PATCH 1/2] tests: mark tests that fail when the TEST_DIRECTORY is unusual

2017-04-09 Thread Ævar Arnfjörð Bjarmason
with the aforementioned change to test-lib.sh. The only exception is t-basic.sh, since its testing the test suite itself its failing 'test --verbose' test needs a change to the test suite wrapper code to be excluded. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t

[PATCH 0/2] test: Detect *lots* of bugs by adding non-alnum to trash dir names

2017-04-09 Thread Ævar Arnfjörð Bjarmason
tests more granularly, e.g.: test_fails_on_unusual_directory_name_types=quotes etc., if the test fails just because of " or ', but I think as it is this makes sense for inclusion, it makes sure we don't regress on the remaining 70% of our test suite. Ævar Arnfjörð Bjarmason (2): t

[PATCH 2/2] test-lib: exhaustively insert non-alnum ASCII into the TRASH_DIRECTORY name

2017-04-09 Thread Ævar Arnfjörð Bjarmason
Change the test library to insert non-alphanumeric ASCII characters into the TRASH_DIRECTORY name, that's the directory the test library creates, chdirs to and runs each individual test from. Unless test_fails_on_unusual_directory_names=1 is declared before importing test-lib.sh (and if perl

[PATCH] grep: plug a trivial memory leak

2017-04-09 Thread Ævar Arnfjörð Bjarmason
(git.c:624) [...]by 0x4051C6: cmd_main (git.c:701) [...]by 0x4C5901: main (common-main.c:43) Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Since pretty much any non-trivial git command leaks because it skips cleanup are patches in this category even accepted? Worth a try... builtin

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

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 10, 2017 at 10:08 AM, Jacob Keller wrote: > On Sun, Apr 9, 2017 at 4:00 AM, Stefan Haller wrote: >> Jacob Keller wrote: >> >>> Agreed. You "take" a lease whenever you push to the remote or when you >>> pull from the

Re: Modifying a bare repo directly

2017-04-10 Thread Ævar Arnfjörð Bjarmason
c0cf172fbb8 $ git show 318448647ab7a2b1f78c87cb8a05ac0cf172fbb8 commit 3184486 Author: Ævar Arnfjörð Bjarmason <ava...@gmail.com> Date: Mon Apr 10 12:29:22 2017 +0200 1st commit diff --git a/hello.txt b/hello.txt new file mode 100644 index 000..ce01362 --- /dev/null ++

Re: [PATCH 2/2] test-lib: exhaustively insert non-alnum ASCII into the TRASH_DIRECTORY name

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 10, 2017 at 1:19 PM, SZEDER Gábor <szeder@gmail.com> wrote: > On Mon, Apr 10, 2017 at 10:02 AM, Ævar Arnfjörð Bjarmason > <ava...@gmail.com> wrote: >> On Mon, Apr 10, 2017 at 3:47 AM, SZEDER Gábor <szeder@gmail.com> wrote: >>>> Change t

Re: Git documentation on branching.

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 10, 2017 at 12:45 PM, Samuel Åslund <sam...@update.uu.se> wrote: > On 17/4/10 12:21, Ævar Arnfjörð Bjarmason wrote: >> >> On Mon, Apr 10, 2017 at 8:56 AM, Samuel Åslund <sam...@update.uu.se> >> wrote: >>> >>> Hi all. >>> &g

Re: Unexpected working directory in post-receive hook in non-bare repository

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Sun, Apr 9, 2017 at 3:01 PM, Simon Ruderich wrote: > The following snippet reproduces the issue for me (note the > remote: line in its output): > > git --version > > rm -rf a b > > git init a > cd a > echo first >data > git add data > git commit

Re: Git documentation on branching.

2017-04-10 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 10, 2017 at 8:56 AM, Samuel Åslund wrote: > Hi all. > > I just started playing around with branching in git. > I have been using it more or less as Subversion until now. > > One feature with "git branch xyz" and "git checkout xyz" that is rather > obvious if you

Re: [PATCH v2] http: honnor empty http.proxy option to bypass proxy

2017-04-11 Thread Ævar Arnfjörð Bjarmason
Since nobody pointed this out already, some grammar/spelling fixes. Also CC-ing Knut who wrote the commit you're referencing. - http: honnor empty http.proxy option to bypass proxy + http: honor empty http.proxy option to bypass proxy On Tue, Apr 11, 2017 at 11:20 AM, Sergey Ryazanov

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 2:35 AM, Jeff King <p...@peff.net> wrote: > On Mon, Apr 10, 2017 at 08:30:23PM -0400, Jeff King wrote: > >> On Tue, Apr 11, 2017 at 01:23:32AM +0200, Ævar Arnfjörð Bjarmason wrote: >> >> > There's one segfault in there: >> > >

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:23 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 01:24:59PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Add exhaustive tests for how the different grep.patternType options & >> the corresponding command-line options

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:48 PM, Jeff King <p...@peff.net> wrote: > On Tue, Apr 11, 2017 at 12:45:55PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Apr 11, 2017 at 12:37 PM, Jeff King <p...@peff.net> wrote: >> > On Sat, Apr 08, 2017 at 01:25:05PM +00

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:37 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 01:25:05PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> diff --git a/builtin/grep.c b/builtin/grep.c >> index 9478ab5dff..dffb9743b8 100644 >> --- a/builtin/grep.c >> +++

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:35 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 01:25:04PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Change the internal USE_LIBPCRE define, & build options flag to use a >> naming convention ending in PCRE1, withou

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

2017-04-11 Thread Ævar Arnfjörð Bjarmason
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 Arnfjörð Bjarmason wrote: > >> Junio: If you're not in some rush to pick this up I'll take this, fix >> up a bunch of other bugs & tests failur

Re: Index files autocompletion too slow in big repositories (w / suggestion for improvement)

2017-04-14 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 15, 2017 at 12:08 AM, Carlos Pita wrote: > This is much faster (below 0.1s): > > __git_index_files () > { > local dir="$(__gitdir)" root="${2-.}" file; > if [ -d "$dir" ]; then > __git_ls_files_helper "$root" "$1" | \ > sed -r

Re: [PATCHv2] rebase: pass --[no]-signoff option to git am

2017-04-14 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 14, 2017 at 6:50 PM, Giuseppe Bilotta wrote: It should be --[no-]signoff, not --[no]-signoff, since the latter implies that ---signoff works, see my 2c7ee986c7 where I fixed some existing instances of this.

[PATCH v2 7/8] pack-objects: fix buggy warning about threads under NO_PTHREADS=YesPlease

2017-04-16 Thread Ævar Arnfjörð Bjarmason
uot;pack.threads" & --threads. Solve this bug by resetting the delta_search_threads variable in git_pack_config(), it might then be set by --threads again and be subsequently warned about, as the test I'm changing here asserts. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com

[PATCH v2 8/8] grep: given --threads with NO_PTHREADS=YesPlease, warn

2017-04-16 Thread Ævar Arnfjörð Bjarmason
able via pack.threads, and have long warned about the same under NO_PTHREADS=YesPlease. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 8 t/t7810-grep.sh | 18 ++ 2 files changed, 26 insertions(+) diff --git a/builtin/grep.c b/builtin/grep.c in

[PATCH v2 1/8] grep: assert that threading is enabled when calling grep_{lock,unlock}

2017-04-16 Thread Ævar Arnfjörð Bjarmason
n unless we're spawning threads. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 65070c52fc..3aa7836a04 100644 --- a/builtin/grep.c +++ b/builtin/gre

[PATCH v2 0/8] grep threading cleanup & tests

2017-04-16 Thread Ævar Arnfjörð Bjarmason
ff suggested kin 3/8. The rest of the patches are a bunch of small related fixes I noticed along the way. Ævar Arnfjörð Bjarmason (8): grep: assert that threading is enabled when calling grep_{lock,unlock} grep: add tests for --threads=N and grep.threads grep: don't redundantly compile throwaway patt

[PATCH v2 2/8] grep: add tests for --threads=N and grep.threads

2017-04-16 Thread Ævar Arnfjörð Bjarmason
were added for it. In developing a change to grep I was able to make '--threads=1 ` segfault, while the test suite still passed. This change fixes that blind spot in the tests. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- t/t7810-grep.sh | 16 1 file change

[PATCH v2 4/8] grep: skip pthreads overhead when using one thread

2017-04-16 Thread Ævar Arnfjörð Bjarmason
tirely when 1 thread is requested. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/builtin/grep.c b/builtin/grep.c index a3d380551b..cb3323060e 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -1225,6 +1225,

[PATCH v2 5/8] tests: add a PTHREADS prerequisite

2017-04-16 Thread Ævar Arnfjörð Bjarmason
Add a PTHREADS prerequisite which is false when git is compiled with NO_PTHREADS=YesPlease. There's lots of custom code that runs when threading isn't available, but before this prerequisite there was no way to test it. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Ma

[PATCH v2 3/8] grep: don't redundantly compile throwaway patterns under threading

2017-04-16 Thread Ævar Arnfjörð Bjarmason
c7 ("grep: teach --debug option to dump the parse tree", 2012-09-13) still works properly with this change. It only emits debugging info during pattern compilation, which is now dumped by the pattern compiled just before the first thread is started. Signed-off-by: Ævar Arnfjörð Bjarmason <a

[PATCH v2 6/8] pack-object & index-pack: add test for --threads warning under NO_PTHREADS

2017-04-16 Thread Ævar Arnfjörð Bjarmason
they might be changed to be i18n'd in the future, and there's no harm in future-proofing the test. There's an existing bug in the implementation of pack-objects which this test currently tests for as-is. Details about the bug & the fix are included in a follow-up change. Signed-off-by: Ævar Arnf

Re: [PATCH 00/12] PCREv2 & more

2017-04-15 Thread Ævar Arnfjörð Bjarmason
On Sat, Apr 15, 2017 at 10:11 AM, Junio C Hamano <gits...@pobox.com> wrote: > Jeff King <p...@peff.net> writes: > >> On Sat, Apr 08, 2017 at 01:24:54PM +, Ævar Arnfjörð Bjarmason wrote: >> >>> This adds PCRE v2 support, but as I was adding that I kept not

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

2017-04-15 Thread Ævar Arnfjörð Bjarmason
On Tue, Apr 11, 2017 at 12:14 PM, Jeff King <p...@peff.net> wrote: > On Sat, Apr 08, 2017 at 01:24:57PM +0000, Ævar Arnfjörð Bjarmason wrote: > >> Reword an outdated comment which suggests that only git-grep can use >> PCRE. > > Makes sense. > >> -# Define

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

2017-04-16 Thread Ævar Arnfjörð Bjarmason
On Fri, Apr 14, 2017 at 11:23 PM, Jeff King <p...@peff.net> wrote: > On Tue, Apr 11, 2017 at 10:56:01PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> > Right, my suggestion was to teach "grep" to treat --threads=1 as "do not >> > spawn any other threads&

[PATCH v3 04/18] grep: remove redundant regflags assignment under PCRE

2017-04-20 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

[PATCH v3 05/18] Makefile & configure: reword outdated comment about PCRE

2017-04-20 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 v3 06/18] grep: add a test for backreferences in PCRE patterns

2017-04-20 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 v3 09/18] grep & rev-list doc: stop promising libpcre for --perl-regexp

2017-04-20 Thread Ævar Arnfjörð Bjarmason
patible regular expression support. By wording the documentation differently and not promising any specific version of PCRE or ever PCRE at all we have more wiggle room to change the implementation. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- Documentation/git-grep.txt

[PATCH v3 08/18] log: add -P as a synonym for --perl-regexp

2017-04-20 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 v3 01/18] grep: amend submodule recursion test in preparation for rx engine testing

2017-04-20 Thread Ævar Arnfjörð Bjarmason
nes. Reuse the pattern established in an earlier commit of mine in this series ("log: add exhaustive tests for pattern style options & config", 2017-04-07). The pattern "(.|.)[\d]" will match this content differently under fixed/basic/extended & perl. Signed-off-by: Ævar Arnf

[PATCH v3 00/18] PCRE v1 improvements & PCRE v2 support

2017-04-20 Thread Ævar Arnfjörð Bjarmason
to remove the concurrent support for v1 & v2 of the library as Jeff & Junio suggested. See the v2 coverletter in <20170419224053.8920-1-ava...@gmail.com> for changes since v1, changes since v2 noted below: Ævar Arnfjörð Bjarmason (18): grep: amend submodule recursion test in preparation

[PATCH v3 03/18] grep: submodule-related case statements should die if new fields are added

2017-04-20 Thread Ævar Arnfjörð Bjarmason
;binary) case-statement as well, but isn't trivial to add since that code isn't currently working with an exhaustive list. Signed-off-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> --- builtin/grep.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/grep.c b/builtin/grep.c index

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