git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v3 00/10] grep: move from kwset to optional PCRE v2

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jul 1, 2019, 21:20 UTC
Message-ID
<20190701212100.27850-1-avarab@gmail.com>
In-Reply-To
<20190627233912.7117-1-avarab@gmail.com>

This v3 has a new patch (3/10) that I believe fixes the regression on MinGW Johannes noted in https://public-inbox.org/git/nycvar.QRO.7.76.6.1907011515150.44@tvgsbejvaqbjf.bet/

As noted in the updated commit message in 10/10 I believe just skipping this test & documenting this in a commit message is the least amount of suck for now. It's really an existing issue with us doing nothing sensible when the log/grep haystack encoding doesn't match the needle encoding supplied via the command line.

We swept that under the carpet with the kwset backend, but PCRE v2 exposes it.

Ævar Arnfjörð Bjarmason (10):
  log tests: test regex backends in "--encode=<enc>" tests
  grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
  t4210: skip more command-line encoding tests on MinGW
  grep: inline the return value of a function call used only once
  grep tests: move "grep binary" alongside the rest
  grep tests: move binary pattern tests into their own file
  grep: make the behavior for NUL-byte in patterns sane
  grep: drop support for \0 in --fixed-strings <pattern>
  grep: remove the kwset optimization
  grep: use PCRE v2 for optimized fixed-string search
 Documentation/git-grep.txt                    |  17 +++
 grep.c                                        | 115 +++++++---------
 grep.h                                        |   3 +-
 revision.c                                    |   3 +
 t/t4210-log-i18n.sh                           |  41 +++++-
 ...a1.sh => t7008-filter-branch-null-sha1.sh} |   0
 ...08-grep-binary.sh => t7815-grep-binary.sh} | 101 --------------
 t/t7816-grep-binary-pattern.sh                | 127 ++++++++++++++++++
 8 files changed, 234 insertions(+), 173 deletions(-)
 rename t/{t7009-filter-branch-null-sha1.sh => t7008-filter-branch-null-sha1.sh} (100%)
 rename t/{t7008-grep-binary.sh => t7815-grep-binary.sh} (55%)
 create mode 100755 t/t7816-grep-binary-pattern.sh
Range-diff:
 1:  cfc01f49d3 =  1:  cfc01f49d3 log tests: test regex backends in "--encode=<enc>" tests
 2:  4b59eb32f0 =  2:  4b59eb32f0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"
 -:  ---------- >  3:  676c76afe4 t4210: skip more command-line encoding tests on MinGW
 3:  cc4d3b50d5 =  4:  da9b491f70 grep: inline the return value of a function call used only once
 4:  d9b29bdd89 =  5:  c42d3268fa grep tests: move "grep binary" alongside the rest
 5:  f85614f435 =  6:  36b9c1c541 grep tests: move binary pattern tests into their own file
 6:  90afca8707 =  7:  3c54e782e6 grep: make the behavior for NUL-byte in patterns sane
 7:  526b925fdc =  8:  8e5f418189 grep: drop support for \0 in --fixed-strings <pattern>
 8:  14269bb295 =  9:  d1cb8319d5 grep: remove the kwset optimization
 9:  c0fd75d102 ! 10:  4de0c82314 grep: use PCRE v2 for optimized fixed-string search
    @@ -15,6 +15,15 @@
         makes the behavior harder to understand and document, and makes tests
         for the different backends more painful.
     
    +    This does change the behavior under non-C locales when "log"'s
    +    "--encoding" option is used and the heystack/needle in the
    +    content/command-line doesn't have a matching encoding. See the recent
    +    change in "t4210: skip more command-line encoding tests on MinGW" in
    +    this series. I think that's OK. We did nothing sensible before
    +    then (just compared raw bytes that had no hope of matching). At least
    +    now the user will get some idea why their grep/log never matches in
    +    that edge case.
    +
         I could also support the PCRE v1 backend here, but that would make the
         code more complex. I'd rather aim for simplicity here and in future
         changes to the diffcore. We're not going to have someone who
-- 
2.22.0.455.g172b71a6c5
Previous: Junio C HamanoNext: Junio C Hamano
Message 48 of 90 in “Support building with GCC v8.x/v9.x”
  1. 0/4 Support building with GCC v8.x/v9.xJohannes Schindelin via GitGitGadget, Jun 13, 2019
  2. 4/4 config: avoid calling `labs()` on too-large data typeJohannes Schindelin via GitGitGadget, Jun 13, 2019
  3. Junio C HamanoJun 13, 2019
  4. René ScharfeJun 16, 2019
  5. René ScharfeJun 16, 2019
  6. René ScharfeJun 16, 2019
  7. Junio C HamanoJun 16, 2019
  8. René ScharfeJun 20, 2019
  9. Junio C HamanoJun 20, 2019
  10. Johannes SchindelinJun 21, 2019
  11. René ScharfeJun 22, 2019
  12. 1/3 config: use unsigned_mult_overflows to check for overflowsRené Scharfe, Jun 22, 2019
  13. 2/3 config: don't multiply in parse_unit_factor()René Scharfe, Jun 22, 2019
  14. 3/3 config: simplify parsing of unit factorsRené Scharfe, Jun 22, 2019
  15. 3/4 winansi: simplify loading the GetCurrentConsoleFontEx() functionJohannes Schindelin via GitGitGadget, Jun 13, 2019
  16. 1/4 poll (mingw): allow compiling with GCC 8 and DEVELOPER=1Johannes Schindelin via GitGitGadget, Jun 13, 2019
  17. 2/4 kwset: allow building with GCC 8Johannes Schindelin via GitGitGadget, Jun 13, 2019
  18. Junio C HamanoJun 13, 2019
  19. SZEDER GáborJun 14, 2019
  20. 0/4 compat/obstack: update from upstreamSZEDER Gábor, Jun 14, 2019
  21. 2/4 SQUASH??? compat/obstack: fix portability issuesSZEDER Gábor, Jun 14, 2019
  22. 4/4 compat/obstack: fix some sparse warningsSZEDER Gábor, Jun 14, 2019
  23. 3/4 SQUASH??? compat/obstack: fix build errors with ClangSZEDER Gábor, Jun 14, 2019
  24. 1/4 compat/obstack: update from upstreamSZEDER Gábor, Jun 14, 2019
  25. Jeff KingJun 14, 2019
  26. Junio C HamanoJun 14, 2019
  27. Ramsay JonesJun 14, 2019
  28. Ramsay JonesJun 14, 2019
  29. SZEDER GáborJun 17, 2019
  30. Junio C HamanoJun 14, 2019
  31. SZEDER GáborJun 17, 2019
  32. Ævar Arnfjörð BjarmasonJun 14, 2019
  33. Can we just get rid of kwset & obstack in favor of optimistically using PCRE v2 JIT?Ævar Arnfjörð Bjarmason, Jun 14, 2019
  34. Ævar Arnfjörð BjarmasonJun 14, 2019
  35. Jeff KingJun 20, 2019
  36. Carlo ArenasJun 15, 2019
  37. brian m. carlsonJun 15, 2019
  38. Ævar Arnfjörð BjarmasonJun 15, 2019
  39. 0/7 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jun 26, 2019
  40. Johannes SchindelinJun 26, 2019
  41. Johannes SchindelinJun 27, 2019
  42. Ævar Arnfjörð BjarmasonJun 27, 2019
  43. Johannes SchindelinJun 27, 2019
  44. 1/9 log tests: test regex backends in "--encode=<enc>" testsÆvar Arnfjörð Bjarmason, Jun 27, 2019
  45. 0/9 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jun 27, 2019
  46. Ævar Arnfjörð BjarmasonJun 28, 2019
  47. Junio C HamanoJun 28, 2019
  48. 00/10 grep: move from kwset to optional PCRE v2Ævar Arnfjörð Bjarmason, Jul 1, 2019
  49. Junio C HamanoJul 1, 2019
  50. Ævar Arnfjörð BjarmasonJul 2, 2019
  51. Johannes SchindelinJul 2, 2019
  52. Junio C HamanoJul 2, 2019
  53. Johannes SchindelinJul 3, 2019
  54. Johannes SchindelinJul 3, 2019
  55. Johannes SchindelinJul 3, 2019
  56. 01/10 log tests: test regex backends in "--encode=<enc>" testsÆvar Arnfjörð Bjarmason, Jul 1, 2019
  57. 02/10 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"Ævar Arnfjörð Bjarmason, Jul 1, 2019
  58. 03/10 t4210: skip more command-line encoding tests on MinGWÆvar Arnfjörð Bjarmason, Jul 1, 2019
  59. 04/10 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jul 1, 2019
  60. 05/10 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jul 1, 2019
  61. 08/10 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jul 1, 2019
  62. 07/10 grep: make the behavior for NUL-byte in patterns saneÆvar Arnfjörð Bjarmason, Jul 1, 2019
  63. 06/10 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jul 1, 2019
  64. 09/10 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jul 1, 2019
  65. 10/10 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jul 1, 2019
  66. 2/9 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>"Ævar Arnfjörð Bjarmason, Jun 27, 2019
  67. 3/9 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jun 27, 2019
  68. 4/9 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jun 27, 2019
  69. 5/9 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jun 27, 2019
  70. 6/9 grep: make the behavior for NUL-byte in patterns saneÆvar Arnfjörð Bjarmason, Jun 27, 2019
  71. 7/9 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jun 27, 2019
  72. 8/9 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jun 27, 2019
  73. 9/9 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jun 27, 2019
  74. 1/7 grep: inline the return value of a function call used only onceÆvar Arnfjörð Bjarmason, Jun 26, 2019
  75. 2/7 grep tests: move "grep binary" alongside the restÆvar Arnfjörð Bjarmason, Jun 26, 2019
  76. Johannes SchindelinJun 26, 2019
  77. Junio C HamanoJun 26, 2019
  78. 4/7 grep: make the behavior for \0 in patterns saneÆvar Arnfjörð Bjarmason, Jun 26, 2019
  79. brian m. carlsonJun 27, 2019
  80. 3/7 grep tests: move binary pattern tests into their own fileÆvar Arnfjörð Bjarmason, Jun 26, 2019
  81. 5/7 grep: drop support for \0 in --fixed-strings <pattern>Ævar Arnfjörð Bjarmason, Jun 26, 2019
  82. Junio C HamanoJun 26, 2019
  83. 6/7 grep: remove the kwset optimizationÆvar Arnfjörð Bjarmason, Jun 26, 2019
  84. 7/7 grep: use PCRE v2 for optimized fixed-string searchÆvar Arnfjörð Bjarmason, Jun 26, 2019
  85. Johannes SchindelinJun 26, 2019
  86. Junio C HamanoJun 26, 2019
  87. Johannes SchindelinJun 27, 2019
  88. Johannes SchindelinJun 27, 2019
  89. Junio C HamanoJun 27, 2019
  90. Johannes SchindelinJun 28, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.