Merge branch 'jk/avoid-redef-system-functions'

The jk/avoid-redef-system-functions-2.30 topic pre-merged for more recent codebase. * jk/avoid-redef-system-functions:

Junio C Hamano committed Dec 19, 2022 at 11:46 UTC 995916e24f25644987f34b8a8e9392c0150804d8

No changes.