From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 11 Mar 2023 19:29:32 +0000 (+0100)
Subject: Sync with 2.32.7
X-Git-Tag: v2.33.8~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcd874d50faf884c57cd78e9e26515a39c552744;p=thirdparty%2Fgit.git

Sync with 2.32.7

* maint-2.32: (26 commits)
  Git 2.32.7
  Git 2.31.8
  tests: avoid using `test_i18ncmp`
  Git 2.30.9
  gettext: avoid using gettext if the locale dir is not present
  apply --reject: overwrite existing `.rej` symlink if it exists
  http.c: clear the 'finished' member once we are done with it
  clone.c: avoid "exceeds maximum object size" error with GCC v12.x
  range-diff: use ssize_t for parsed "len" in read_patches()
  range-diff: handle unterminated lines in read_patches()
  range-diff: drop useless "offset" variable from read_patches()
  t5604: GETTEXT_POISON fix, conclusion
  t5604: GETTEXT_POISON fix, part 1
  t5619: GETTEXT_POISON fix
  t0003: GETTEXT_POISON fix, conclusion
  t0003: GETTEXT_POISON fix, part 1
  t0033: GETTEXT_POISON fix
  http: support CURLOPT_PROTOCOLS_STR
  http: prefer CURLOPT_SEEKFUNCTION to CURLOPT_IOCTLFUNCTION
  http-push: prefer CURLOPT_UPLOAD to CURLOPT_PUT
  ci: install python on ubuntu
  ...
---

bcd874d50faf884c57cd78e9e26515a39c552744
diff --cc .github/workflows/main.yml
index b053b01c66,158be9a83a..9f99e59a7c
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@@ -282,31 -345,11 +282,31 @@@ jobs
      if: needs.ci-config.outputs.enabled == 'yes'
      env:
        jobname: StaticAnalysis
-     runs-on: ubuntu-18.04
+     runs-on: ubuntu-22.04
      steps:
 -    - uses: actions/checkout@v1
 +    - uses: actions/checkout@v2
      - run: ci/install-dependencies.sh
      - run: ci/run-static-analysis.sh
 +  sparse:
 +    needs: ci-config
 +    if: needs.ci-config.outputs.enabled == 'yes'
 +    env:
 +      jobname: sparse
 +    runs-on: ubuntu-20.04
 +    steps:
 +    - name: Download a current `sparse` package
 +      # Ubuntu's `sparse` version is too old for us
 +      uses: git-for-windows/get-azure-pipelines-artifact@v0
 +      with:
 +        repository: git/git
 +        definitionId: 10
 +        artifact: sparse-20.04
 +    - name: Install the current `sparse` package
 +      run: sudo dpkg -i sparse-20.04/sparse_*.deb
 +    - uses: actions/checkout@v2
 +    - name: Install other dependencies
 +      run: ci/install-dependencies.sh
 +    - run: make sparse
    documentation:
      needs: ci-config
      if: needs.ci-config.outputs.enabled == 'yes'