Merge branch 'main' into debug-failure-to-check-out

Author: chrisd8088

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,12 +23,16 @@ A clear and concise description of what you expected to happen.
 **System environment**
 The version of your operating system, plus any relevant information about platform or configuration (e.g., container or CI usage, Cygwin, WSL, or non-Basic authentication).  If relevant, include the output of `git config -l` as a code block.
 
+Please also mention the usage of any proxy, including any TLS MITM device or non-default antivirus or firewall.
+
 **Output of `git lfs env`**
 The output of running `git lfs env` as a code block.
 
 **Additional context**
 Any other relevant context about the problem here.
 
+If you're having problems trying to push or pull data, please run the command with `GIT_TRACE=1 GIT_TRANSFER_TRACE=1 GIT_CURL_VERBOSE=1` and include it inline or attach it as a text file.  In a bash or other POSIX shell, you can simply prepend this string and a space to the command.
+
 <!--
 Please note: if you're receiving a message from the server side (including a
 `batch response` message), please contact your Git hosting provider.  This

.github/workflows/ci.yml

@@ -9,24 +9,22 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-        go: ['1.21.x']
+        go: ['1.24.x']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
-      # We update the current tag as the checkout step turns annotated tags
-      # into lightweight ones by accident, breaking "git describe".
-      # See https://github.com/actions/checkout/issues/882 for details.
-    - uses: ruby/setup-ruby@v1
-    - run: gem install asciidoctor
+        persist-credentials: false
+        ref: ${{ github.ref }}
+      # We specify the current ref because otherwise the checkout turns
+      # annotated tags into lightweight ones, breaking "git describe".
+      # See https://github.com/actions/checkout/issues/290 and
+      # https://github.com/actions/checkout/issues/882 for details.
+    - run: sudo gem install asciidoctor
     - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
-    - run: brew install gettext
-      if: ${{ startsWith(matrix.os, 'macos-') }}
     - run: sudo apt-get update && sudo apt-get -y install gettext libarchive-tools
       if: ${{ startsWith(matrix.os, 'ubuntu-') }}
       env:
@@ -47,14 +45,14 @@ jobs:
     name: Build with specific Go
     strategy:
       matrix:
-        go: ['1.20.x']
+        go: ['1.23.x']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
+        persist-credentials: false
+        ref: ${{ github.ref }}
     - uses: actions/setup-go@v5
       with:
         go-version: ${{ matrix.go }}
@@ -66,30 +64,27 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
-      shell: bash
-    - uses: ruby/setup-ruby@v1
+        persist-credentials: false
+        ref: ${{ github.ref }}
     - run: gem install asciidoctor
-    - run: Rename-Item -Path C:\msys64 -NewName msys64-tmp -Force
-      # We move the MSYS2 installed for Ruby aside to prevent use of its Git,
-      # which does not honour the PATH we set to our built git-lfs binary.
     - uses: actions/setup-go@v5
       with:
-        go-version: '1.21.x'
+        go-version: '1.24.x'
     - run: mkdir -p "$HOME/go/bin"
       shell: bash
     - run: set GOPATH=%HOME%\go
     - run: choco install -y InnoSetup
-    - run: choco install -y strawberryperl
     - run: make man
       shell: bash
     - run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" go install github.com/josephspurrier/goversioninfo/cmd/goversioninfo@latest
       shell: bash
-    - run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" env -u TMPDIR script/cibuild
+    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+      with:
+        flavor: minimal
+      # We install the SDK so as to have access to the msgfmt.exe binary
+      # from the GNU gettext package.
+    - run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" script/cibuild
       shell: bash
-      # We clear the TMPDIR set for Ruby so mktemp and Go use the same
-      # volume for temporary files.
     - run: rm -f commands/mancontent_gen.go
       shell: bash
     - run: GOPATH="$HOME/go" PATH="$HOME/go/bin:$PATH" make GOARCH=386 -B
@@ -130,9 +125,18 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
+        persist-credentials: false
+        ref: ${{ github.ref }}
+    - uses: actions/setup-go@v5
+      with:
+        go-version: '1.24.x'
     - run: git clone -b master https://github.com/git/git.git "$HOME/git"
+    - run: |
+        echo "GIT_INSTALL_DIR=$HOME/git" >> "$GITHUB_ENV"
+        echo "$HOME/git/bin" >> "$GITHUB_PATH"
+      if: ${{ matrix.os == 'macos-latest' }}
+      # We install our custom Git version into a PATH location ahead of
+      # that of the Git installed by Homebrew.
     - run: script/build-git "$HOME/git"
     - run: GIT_DEFAULT_HASH=sha256 script/cibuild
   build-earliest:
@@ -145,9 +149,18 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
+        persist-credentials: false
+        ref: ${{ github.ref }}
+    - uses: actions/setup-go@v5
+      with:
+        go-version: '1.24.x'
     - run: git clone -b v2.0.0 https://github.com/git/git.git "$HOME/git"
+    - run: |
+        echo "GIT_INSTALL_DIR=$HOME/git" >> "$GITHUB_ENV"
+        echo "$HOME/git/bin" >> "$GITHUB_PATH"
+      if: ${{ matrix.os == 'macos-latest' }}
+      # We install our custom Git version into a PATH location ahead of
+      # that of the Git installed by Homebrew.
     - run: script/build-git "$HOME/git"
     - run: script/cibuild
   build-docker:
@@ -157,37 +170,20 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
-    - uses: ruby/setup-ruby@v1
+        persist-credentials: false
+        ref: ${{ github.ref }}
     - run: git clone https://github.com/git-lfs/build-dockers.git "$HOME/build-dockers"
     - run: (cd "$HOME/build-dockers" && ./build_dockers.bsh)
     - run: ./docker/run_dockers.bsh --prune
-  build-docker-cross:
-    name: Build Cross Linux packages
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [arm64]
-        container: [debian_12]
+  build-docker-arm:
+    name: Build Linux ARM packages
+    runs-on: ubuntu-24.04-arm
     steps:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - run: git fetch origin "+${GITHUB_REF}:${GITHUB_REF}"
-      if: ${{ github.ref_type == 'tag' }}
-    - uses: ruby/setup-ruby@v1
-    - run: |
-        echo '{"experimental": true}' | sudo tee /etc/docker/daemon.json
-        sudo systemctl restart docker.service
-        docker version -f '{{.Server.Experimental}}'
-    - uses: docker/setup-qemu-action@v3
+        persist-credentials: false
+        ref: ${{ github.ref }}
     - run: git clone https://github.com/git-lfs/build-dockers.git "$HOME/build-dockers"
-    - run: (cd "$HOME/build-dockers" && ./build_dockers.bsh --arch=$ARCH $CONTAINER)
-      env:
-        ARCH: ${{matrix.arch}}
-        CONTAINER: ${{matrix.container}}
-    - run: ./docker/run_dockers.bsh --prune --arch=$ARCH $CONTAINER
-      env:
-        ARCH: ${{matrix.arch}}
-        CONTAINER: ${{matrix.container}}
+    - run: (cd "$HOME/build-dockers" && ./build_dockers.bsh --arch=arm64 debian_11 debian_12)
+    - run: ./docker/run_dockers.bsh --prune --arch=arm64 debian_11 debian_12