Re: [PATCH v2 4/7] grep: add support for the PCRE v1 JIT API

2017-05-14 Thread Ævar Arnfjörð Bjarmason
On Sun, May 14, 2017 at 5:10 PM, Ævar Arnfjörð Bjarmason wrote: > On Sun, May 14, 2017 at 4:43 PM, Simon Ruderich wrote: >> On Sat, May 13, 2017 at 11:45:32PM +, Ęvar Arnfjörš Bjarmason wrote: >>> [snip] >>> >>> +#ifdef PCRE_CONFIG_JIT >>> + if

Re: [Git 2.13.0] BUG: setup_git_env called without repository

2017-05-14 Thread Josh Hagins
Hi Johannes, Here's the full text of the gdb session, including backtrace. Hope it helps! $ pwd /Users/jhagins/dev/github $ gdb -args ./git/git config --local --get user.name GNU gdb (GDB) 7.12.1 Copyright (C) 2017 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later

Re: [PATCH 1/7] compat/regex: add a README with a maintenance guide

2017-05-14 Thread arnold
Junio C Hamano wrote: > Johannes Schindelin writes: > > > - rather than scraping the files from the CGit website (which does not > > guarantee that the first scraped file will be from the same revision as > > the last scraped file), I would

Re: [PATCH v2] send-email: support validate hook

2017-05-14 Thread Junio C Hamano
Jonathan Tan writes: > diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt > index 706091a56..b2514f4d4 100644 > --- a/Documentation/githooks.txt > +++ b/Documentation/githooks.txt > @@ -447,6 +447,14 @@ rebase:: > The commits are guaranteed to be

Re: [PATCH 1/3] usage.c: add BUG() function

2017-05-14 Thread Junio C Hamano
Jeff King writes: > On Fri, May 12, 2017 at 11:28:50PM -0400, Jeff King wrote: > >> +static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, >> va_list params) >> +{ >> +char prefix[256]; >> + >> +/* truncation via snprintf is OK here */ >> +if

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Jeff King
On Sun, May 14, 2017 at 01:33:48AM -0700, Brian Malehorn wrote: > > And two, we usually indent the contents to the same level as the outer > > cat/EOF pair > > Fixed. > > I was indenting the same as the other tests in that file. But if the way > you described is the preferred way, then sure.

Re: [PATCH 1/7] compat/regex: add a README with a maintenance guide

2017-05-14 Thread Junio C Hamano
arn...@skeeve.com writes: > Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > - rather than scraping the files from the CGit website (which does not >> > guarantee that the first scraped file will be from the same revision as >> >

Re: [PATCH v6] fetch-pack: always allow fetching of literal SHA1s

2017-05-14 Thread Junio C Hamano
Jeff King writes: > On Fri, May 12, 2017 at 01:46:48PM -0700, Jonathan Tan wrote: > >> Change from v5: used "ensure_tip_oids_initialized" function instead. >> This removes some of the muddiness (e.g. with newlist being modified >> after the function). > > I don't think it really

Re: [PATCH 11/29] grep: add a test helper function for less verbose -f \0 tests

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> It somehow was unintuitive that 0 expected failure and 1 expected >> success, but it probably was just me. > > Except this. The wildmatch uses the same idiom, and I think it makes > sense. 1 = true, 0 = false, ... when all we wanted was >

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Junio C Hamano
Jeff King writes: >> If a commit message is being editted as "verbose", it will contain a >> scissors string ("-- >8 --") and a diff: >> >> my subject >> >> # >8 >> # Do not touch the line above. >> # Everything

[PATCH v3] builtin/log: honor log.decorate

2017-05-14 Thread brian m. carlson
The recent change that introduced autodecorating of refs accidentally broke the ability of users to set log.decorate = false to override it. When the git_log_config was traversed a second time with an option other than log.decorate, the decoration style would be set to the automatic style, even if

Cant clone/pull/fetch because of "Unable to create temporary file '$HOME/Dev/linux-stable/.git/objects/pack/tmp_pack_'

2017-05-14 Thread Thomas Schweikle
$ git clone https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-stable Cloning into 'linux-stable'... remote: Counting objects: 5932092, done. remote: Compressing objects: 100% (154131/154131), done. fatal: Unable to create temporary file

Re: [PATCH] config: complain about --local outside of a git repo

2017-05-14 Thread Josh Hagins
Hi Jeff, For context, the "user.name" bit was purely notional; I just wanted to give a sample reproduction. Where I've actually been running into this in real life is with oh-my-git, a GitHub-themed Powerline bash prompt:

Re: [PATCH] compat/regex: fix compilation on Windows

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Let's drop this current gawk import series. > > After talking to the gawk author it turns out it's better to use the > version from gnulib, this includes the equivalent of your patch. OK. That may make things simpler ;-) Thanks.

Re: [PATCH v3] builtin/log: honor log.decorate

2017-05-14 Thread Junio C Hamano
"brian m. carlson" writes: > The recent change that introduced autodecorating of refs accidentally > broke the ability of users to set log.decorate = false to override it. > When the git_log_config was traversed a second time with an option other > than

Re: [PATCH v2 4/7] grep: add support for the PCRE v1 JIT API

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> Yes I could do that, no reason not to, and as you point out it would >> reduce duplication. >> >> I wrote it like this trying to preserve the indentation with/without >> the macro being true, thinking someone would have an issue with it >>

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Jeff King
On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > >> diff --git a/builtin/commit.c b/builtin/commit.c > >> index 2de5f6cc6..2ce9c339d 100644 > >> --- a/builtin/commit.c > >> +++ b/builtin/commit.c > >> @@ -1735,7 +1735,8 @@ int cmd_commit(int argc, const char **argv, const > >>

Re: [PATCH v4 1/3] usability: don't ask questions if no reply is required

2017-05-14 Thread Junio C Hamano
Johannes Sixt writes: > Am 13.05.2017 um 00:36 schrieb Junio C Hamano: >> Thanks, all three patches look good. Will queue. >> >> Let's merge them to 'next' soonish and eventually down to 'master' >> and 'maint'. > > The patches change translated strings. You should probably wait

Re: [PATCH] fixup! log: add exhaustive tests for pattern style options & config

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Thanks for the hotfix. I'll fix this in my v2, but do it differently > in such a way that I can still run these tests on windows. > > I.e. the actual test here just needs these odd characters in the > commit message. It's just an unintended

Ich brauche Ihre Unterstützung zu investieren !!

2017-05-14 Thread Ruth Williams
Sehr geehrte Damen und Herren, Ich brauche Ihre Unterstützung in Ihrem Land zu verlagern und zu investieren. Ich bitte Sie um Hilfe, weil ich nicht das Wissen überGeschäft und die Regeln, die Ihr Land für eine sichere Investition führen. Werden Sie versprechen, mit mir aufrichtig zu sein?

Re: [PATCH v2 4/7] grep: add support for the PCRE v1 JIT API

2017-05-14 Thread Simon Ruderich
On Sat, May 13, 2017 at 11:45:32PM +, Ævar Arnfjörð Bjarmason wrote: > [snip] > > +#ifdef PCRE_CONFIG_JIT > + if (p->pcre1_jit_on) > + ret = pcre_jit_exec(p->pcre1_regexp, p->pcre1_extra_info, line, > + eol - line, 0, flags, ovector, > +

Re: [PATCH v2 4/7] grep: add support for the PCRE v1 JIT API

2017-05-14 Thread Ævar Arnfjörð Bjarmason
On Sun, May 14, 2017 at 4:43 PM, Simon Ruderich wrote: > On Sat, May 13, 2017 at 11:45:32PM +, Ęvar Arnfjörš Bjarmason wrote: >> [snip] >> >> +#ifdef PCRE_CONFIG_JIT >> + if (p->pcre1_jit_on) >> + ret = pcre_jit_exec(p->pcre1_regexp, p->pcre1_extra_info,

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Jeff King
On Mon, May 15, 2017 at 12:32:24PM +0900, Junio C Hamano wrote: > Jeff King writes: > > > On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > > > >> >> diff --git a/builtin/commit.c b/builtin/commit.c > >> >> index 2de5f6cc6..2ce9c339d 100644 > >> >> ---

Re: [PATCH v7 04/10] convert: move packet_write_line() into pkt-line as packet_writel()

2017-05-14 Thread Junio C Hamano
Jeff King writes: > This isn't a new problem, but I noticed that this function should > probably get annotated to describe its interface. > > Junio, can you pick up the patch below on top of Ben's series (or I'd be > fine if it were squashed into this patch)? Surely. Thanks for

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Junio C Hamano
Junio C Hamano writes: > This can be done by the same logic as the existing helper > function, wt_status_truncate_message_at_cut_line(), uses, > but it wants the caller to pass a strbuf to it. Because the > helper function ignore_non_trailer()

Re: [PATCH v2 18/29] grep: catch a missing enum in switch statement

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Add a die(...) to a default case for the switch statement selecting > between grep pattern types under --recurse-submodules. > > Normally this would be caught by -Wswitch, but the grep_pattern_type > type is converted to int by going through

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Junio C Hamano
Brian Malehorn writes: > If a commit message is being edited as "verbose", it will contain a > scissors string ("-- >8 --") and a diff: > > my subject > > # >8 > # Do not touch the line above. > # Everything

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Junio C Hamano
Jeff King writes: > On Mon, May 15, 2017 at 11:12:03AM +0900, Junio C Hamano wrote: > >> >> diff --git a/builtin/commit.c b/builtin/commit.c >> >> index 2de5f6cc6..2ce9c339d 100644 >> >> --- a/builtin/commit.c >> >> +++ b/builtin/commit.c >> >> @@ -1735,7 +1735,8 @@ int

Re: [PATCH v4] send-email: --batch-size to work around some SMTP server limit

2017-05-14 Thread Junio C Hamano
xiaoqiang zhao writes: > Some email servers (e.g. smtp.163.com) limit the number emails to be > sent per session(connection) and this will lead to a faliure when > sending many messages. > > Teach send-email to disconnect after sending a number of messages > (configurable via

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

2017-05-14 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > + echo 2e >expect && > + # In PCRE \d in [\d] is like saying "0-9", and matches the 2 > + # in 2e... > + git -C num_commits log -1 --pretty="tformat:%s" -F -E --perl-regexp > --grep="[\d]" >actual && > + test_cmp expect

Re: [PATCH] config: complain about --local outside of a git repo

2017-05-14 Thread Jeff King
On Sun, May 14, 2017 at 08:31:54PM -0400, Josh Hagins wrote: > For context, the "user.name" bit was purely notional; I just wanted to > give a sample reproduction. Where I've actually been running into this > in real life is with oh-my-git, a GitHub-themed Powerline bash prompt: >

Re: [PATCH v3] builtin/log: honor log.decorate

2017-05-14 Thread Alex Henrie
2017-05-14 20:35 GMT-06:00 Junio C Hamano : > "brian m. carlson" writes: > >> The recent change that introduced autodecorating of refs accidentally >> broke the ability of users to set log.decorate = false to override it. >> When the git_log_config

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Ævar Arnfjörð Bjarmason
On Sun, May 14, 2017 at 5:39 AM, Brian Malehorn wrote: > If a commit message is being editted as "verbose", it will contain a Typo, should be "edited": https://en.wiktionary.org/wiki/editted

Re: checkout -b remotes/origin/ should not work

2017-05-14 Thread Junio C Hamano
Jeff King writes: > I think this problem extends beyond "remotes/". The worst is: > > git checkout -b HEAD > > but there are many confusing variants: > > git checkout -b refs/heads/foo > git checkout -b tags/v1.0 > > etc. Those are all perfectly legal names, but almost

Re: [RFC PATCH v2 04/22] blame: move origin and entry structures to header

2017-05-14 Thread Junio C Hamano
Jeff Smith writes: > The origin and blame_entry structures are core to the blame interface > and reference each other. Since origin will be more exposed, rename it > to blame_origin to clarify what it is a part of. > > Signed-off-by: Jeff Smith > --- >

[PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Brian Malehorn
If a commit message is being edited as "verbose", it will contain a scissors string ("-- >8 --") and a diff: my subject # >8 # Do not touch the line above. # Everything below will be removed. diff --git a/foo.txt b/foo.txt

Re: [PATCH] interpret-trailers: obey scissors lines

2017-05-14 Thread Brian Malehorn
> One, we'd usually use "\EOF" here unless you > really do want to interpolate inside the here document. Fixed, and I learned something new. > And two, we usually indent the contents to the same level as the outer > cat/EOF pair Fixed. I was indenting the same as the other tests in that file.