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