]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'hm/paint-hits-in-log-grep' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Nov 2021 22:48:00 +0000 (14:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Nov 2021 22:48:00 +0000 (14:48 -0800)
"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"


Trivial merge