From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Nov 2021 22:48:00 +0000 (-0800)
Subject: Merge branch 'hm/paint-hits-in-log-grep' into maint
X-Git-Tag: v2.34.1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a650ff5aecf4be98c78ccfcae388a8d4029a46cf;p=thirdparty%2Fgit.git

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"
---

a650ff5aecf4be98c78ccfcae388a8d4029a46cf