Merge #26195: ci: Use git2.34 for lint task

d8ded8b ci: Use git2.34 for lint task (MacroFake)

Pull request description:

  Since most maintainers use a recent version of git that uses the `ort` strategy by default (https://git-scm.com/docs/merge-strategies/2.34.0), bump git for the lint taks as well.

  Fixes #26130 (comment)

ACKs for top commit:
  fanquake:
    ACK d8ded8b - seems fine for now, and to keep python3.6 around. When we bump to >= Jammy in future we'll have to pick from Python3.10+.

Tree-SHA512: 5a9c40b1c242678a7f92e641db026309b3e2e99d7d032778c98eeb56f7abd65f9e0a24f9b2ccf0350d5c0286d50f1ac5969e4249beaa5ffc4b00d06ca8b141bc

ci/lint/04_install.sh

@@ -8,6 +8,13 @@ export LC_ALL=C
 
 ${CI_RETRY_EXE} apt-get update
 ${CI_RETRY_EXE} apt-get install -y clang-format-9 python3-pip curl git gawk jq
+(
+  # Temporary workaround for https://github.com/bitcoin/bitcoin/pull/26130#issuecomment-1260499544
+  # Can be removed once the underlying image is bumped to something that includes git2.34 or later
+  sed -i -e 's/bionic/jammy/g' /etc/apt/sources.list
+  ${CI_RETRY_EXE} apt-get update
+  ${CI_RETRY_EXE} apt-get install -y --reinstall git
+)
 update-alternatives --install /usr/bin/clang-format      clang-format      "$(which clang-format-9     )" 100
 update-alternatives --install /usr/bin/clang-format-diff clang-format-diff "$(which clang-format-diff-9)" 100