summaryrefslogtreecommitdiff
path: root/sha1collisiondetection
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-11-23 14:48:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-23 14:48:00 -0800
commita650ff5aecf4be98c78ccfcae388a8d4029a46cf (patch)
treeb693f90020964c5bd2915361af298dbd9bdfcb55 /sha1collisiondetection
parentGit 2.34 (diff)
parentRevert "grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data" (diff)
downloadtgif-a650ff5aecf4be98c78ccfcae388a8d4029a46cf.tar.xz
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"
Diffstat (limited to 'sha1collisiondetection')
0 files changed, 0 insertions, 0 deletions