From 22fcdb39a4ee7241ec737b1b9e698d5fec6ad719 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 19 Jul 2024 11:28:07 +0200
Subject: [PATCH 1/2] Revert "ci: implement a (temporary) workaround to help
 switching to `asciidoctor`"

This was a temporary workaround and is not needed anymore.

This reverts commit 0546109428e866c5ff1bfd1482e03f80a55b58b8.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 .github/workflows/main.yml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7502b1a967bac..bd3194118bd51 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -59,24 +59,6 @@ jobs:
           # reduce time required to install packages by disabling pacman's disk space checking
           sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf &&
 
-          # help git-sdk-arm64 switch from `asciidoc` to `asciidoctor`
-          if test mingw-w64-git = '${{ matrix.directory }}'
-          then
-            packages=$(ls -d /var/lib/pacman/local/mingw-w64-*-asciidoctor-extensions-* 2>/dev/null |
-              sed -e 's|-[0-9].*||' -e 's|.*/||')
-            if test -n "$packages"
-            then
-              pacman -R --noconfirm $packages
-            fi &&
-            for prefix in /mingw32 /mingw64 /clangarm64
-            do
-              if test -x $prefix/bin/gem
-              then
-                PATH=$prefix/bin:$PATH gem uninstall asciidoctor
-              fi
-            done
-          fi &&
-
           top_dir=$PWD &&
           cd "${{ matrix.directory }}" &&
           MAKEFLAGS=-j8 makepkg-mingw -s --noconfirm &&

From 3e9184ff29f0a97ca2e0d7647f54a6ccb897e371 Mon Sep 17 00:00:00 2001
From: A2uria <83493416+A2uria@users.noreply.github.com>
Date: Fri, 19 Jul 2024 16:53:36 +0800
Subject: [PATCH 2/2] mingw-w64-git: use /proc/cygdrive prefix in bin path when
 installing redirectors

If cygdrive is mounted to something other than `/` (e.g. `/mnt/`),
upgrading `mingw-w64-git` using pacman will result in redirectors (e.g.
`/bin/git.exe`) being installed to an incorrect path. (e.g. `C:/Program
Files/Git/bin` to `C:/Program Files/Git/C/Program Files/Git/bin`).

Signed-off-by: A2uria <83493416+A2uria@users.noreply.github.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 mingw-w64-git/git.install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mingw-w64-git/git.install b/mingw-w64-git/git.install
index df4e628cb4ead..32a4cb36ca722 100644
--- a/mingw-w64-git/git.install
+++ b/mingw-w64-git/git.install
@@ -4,7 +4,7 @@ mingw_prefix_path () {
 }
 
 bin_path () {
-	echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/\1/')/bin"
+	echo "$(cygpath -am / | sed 's/^\([A-Z]\):/\/proc\/cygdrive\/\1/')/bin"
 }
 
 copy_files () {