Sync with Git 2.32.5

diff --cc attr.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc pretty.c
Simple merge

diff --cc t/t4205-log-pretty-formats.sh
Simple merge

diff --cc t/test-lib.sh
Simple merge