Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Junio C Hamano writes: >> Ok, there was a miniscule conflicts but otherwise the squashed >> material was all coming from a single step in the original, so >> I did so myself. Let's start merging the result to 'next' ;-) >> >> Thanks. > > IOW, this on top of the fixup we discussed. > > sideband.

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Junio C Hamano writes: > Junio C Hamano writes: > >> Duy Nguyen writes: >> >>> The rest looks good (after your comment fixup). I see you already have >>> all the changes in your SQUASH??? commit. Do you want me to resend or >>> you will just squash this in locally? >> >> Squashing in would need

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Junio C Hamano writes: > Duy Nguyen writes: > >> The rest looks good (after your comment fixup). I see you already have >> all the changes in your SQUASH??? commit. Do you want me to resend or >> you will just squash this in locally? > > Squashing in would need to redo this into a few relevant c

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Duy Nguyen writes: > The rest looks good (after your comment fixup). I see you already have > all the changes in your SQUASH??? commit. Do you want me to resend or > you will just squash this in locally? Squashing in would need to redo this into a few relevant commits, so it won't be "just squas

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Duy Nguyen writes: > On Fri, Jul 1, 2016 at 8:18 PM, Junio C Hamano wrote: >> Duy Nguyen writes: >> >>> Makes sense. But then if opt->ignore_case is false and regflags >>> happens to have REG_ICASE set, should we clear it as well? >> >> I think .ignore_case is set iff '-i' is given, and .regfla

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Duy Nguyen
On Fri, Jul 1, 2016 at 8:18 PM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Makes sense. But then if opt->ignore_case is false and regflags >> happens to have REG_ICASE set, should we clear it as well? > > I think .ignore_case is set iff '-i' is given, and .regflags has > REG_ICASE only if '-

Re: [PATCH v2 00/12] nd/icase updates

2016-07-01 Thread Junio C Hamano
Duy Nguyen writes: > Makes sense. But then if opt->ignore_case is false and regflags > happens to have REG_ICASE set, should we clear it as well? I think .ignore_case is set iff '-i' is given, and .regflags has REG_ICASE only if '-i' is given and the user said she does not want literal string ma

Re: [PATCH v2 00/12] nd/icase updates

2016-06-30 Thread Duy Nguyen
On Mon, Jun 27, 2016 at 4:53 PM, Junio C Hamano wrote: >> diff --git a/grep.c b/grep.c >> index cb058a5..92587a8 100644 >> --- a/grep.c >> +++ b/grep.c >> @@ -432,15 +432,8 @@ static void compile_regexp(struct grep_pat *p, struct >> grep_opt *opt) >> icase = opt->regflags & REG_ICA

Re: [PATCH v2 00/12] nd/icase updates

2016-06-27 Thread Junio C Hamano
Junio C Hamano writes: > if (p->fixed) { > p->kws = kwsalloc(icase ? tolower_trans_tbl : NULL); > kwsincr(p->kws, p->pattern, p->patternlen); > kwsprep(p->kws); > return; > } else if (opt->fixed) { > + /* > +

Re: [PATCH v2 00/12] nd/icase updates

2016-06-27 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > v2 fixes Junio's and Jeff's comments (both good). The sharing "!icase > || ascii_only" is made a separate commit (6/12) because I think it > takes some seconds to realize that the conversion is correct and it's > technically not needed in 5/12 (and it's sort of the

[PATCH v2 00/12] nd/icase updates

2016-06-24 Thread Nguyễn Thái Ngọc Duy
v2 fixes Junio's and Jeff's comments (both good). The sharing "!icase || ascii_only" is made a separate commit (6/12) because I think it takes some seconds to realize that the conversion is correct and it's technically not needed in 5/12 (and it's sort of the opposite of 1/12) Interdiff diff --gi