From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Nov 2021 05:57:03 +0000 (-0800)
Subject: Merge branch 'hm/paint-hits-in-log-grep'
X-Git-Tag: v2.35.0-rc0~145
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccd3258b4d6af2f7b9b331a09543fdc8325ff170;p=thirdparty%2Fgit.git

Merge branch 'hm/paint-hits-in-log-grep'

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

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

ccd3258b4d6af2f7b9b331a09543fdc8325ff170