Merge branch 'hm/paint-hits-in-log-grep' into maint
commita650ff5aecf4be98c78ccfcae388a8d4029a46cf
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Nov 2021 22:48:00 +0000 (23 14:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Nov 2021 22:48:00 +0000 (23 14:48 -0800)
treeb693f90020964c5bd2915361af298dbd9bdfcb55
parentcd3e606211bb1cf8bc57f7d76bab98cc17a150bc
parente7f3925bed86edf1b79fd18e5600252e445019d1
Merge branch 'hm/paint-hits-in-log-grep' into maint

"git grep" looking in a blob that has non-UTF8 payload was
completely broken when linked with versions of PCREv2 library older
than 10.34 in the latest release.

* hm/paint-hits-in-log-grep:
  Revert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data"