From f91558bc5113035e16a04d10c4c39f60c1234526 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 10 Oct 2024 21:52:25 +0200
Subject: [PATCH] msys2-runtime: operate mostly on the bare `msys2-runtime`
 repo

There is also no need to make `src/msys2-runtime` a bare clone; It can
simply be a Git worktree. Does not even need the files checked out.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 update-scripts/version/msys2-runtime | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/update-scripts/version/msys2-runtime b/update-scripts/version/msys2-runtime
index 87e2979..4a2135f 100755
--- a/update-scripts/version/msys2-runtime
+++ b/update-scripts/version/msys2-runtime
@@ -32,22 +32,21 @@ git --git-dir=msys2-runtime config remote.origin.partialCloneFilter blob:none &&
 git --git-dir=msys2-runtime config remote.origin.fetch 'refs/tags/cygwin-*:refs/tags/cygwin-*' &&
 git --git-dir=msys2-runtime fetch origin &&
 
-git clone --bare msys2-runtime src/msys2-runtime &&
-git --git-dir=src/msys2-runtime config remote.origin.url https://github.com/git-for-windows/msys2-runtime &&
-# pretend to be a partial clone
-git --git-dir=src/msys2-runtime config remote.origin.promisor true &&
-git --git-dir=src/msys2-runtime config remote.origin.partialCloneFilter blob:none ||
-die "Failed to initialize the src/msys2-runtime repository"
+git --git-dir=msys2-runtime config remote.g4w.url https://github.com/git-for-windows/msys2-runtime &&
+# pretend to be a partially-cloned remote, too
+git --git-dir=msys2-runtime config remote.g4w.promisor true &&
+git --git-dir=msys2-runtime config remote.g4w.partialCloneFilter blob:none &&
+git --git-dir=msys2-runtime fetch g4w $revision ||
+die "Failed to initialize the msys2-runtime repository"
 
-git --git-dir=src/msys2-runtime reset --soft "$revision" &&
 previous_commit="$(cat msys2-runtime.commit)" && {
-    test 0 = $(git --git-dir=src/msys2-runtime rev-list --count "$revision..$previous_commit") ||
+    test 0 = $(git --git-dir=msys2-runtime rev-list --count "$revision..$previous_commit") ||
     die "The revision $revision is not a direct descendant of $previous_commit"
 } &&
 
 # update pkgver if needed
 update_pkgver= &&
-pkgver=$(git --git-dir=src/msys2-runtime describe --match='cygwin-[0-9]*' "$revision") &&
+pkgver=$(git --git-dir=msys2-runtime describe --match='cygwin-[0-9]*' "$revision") &&
 pkgver=${pkgver#cygwin-} &&
 pkgver=${pkgver%%-*} &&
 if test "$pkgver" != "$(sed -n 's/^pkgver=\(.*\)/\1/p' PKGBUILD)"
@@ -60,8 +59,8 @@ then
 fi &&
 
 # pre-fetch the required blobs
-git --git-dir=src/msys2-runtime fetch origin \
-    $(git --git-dir=src/msys2-runtime -c core.abbrev=no \
+git --git-dir=msys2-runtime fetch g4w \
+    $(git --git-dir=msys2-runtime -c core.abbrev=no \
         log --format='%n' --raw "refs/tags/cygwin-$pkgver..$revision" ^"$revision^{/^Start.the.merging-rebase}" |
         cut -d ' ' -f 3,4 |
         tr ' ' '\n' |
@@ -69,6 +68,9 @@ git --git-dir=src/msys2-runtime fetch origin \
         sort |
         uniq) &&
 
+git --git-dir=msys2-runtime reset --soft "$revision" &&
+git --git-dir=msys2-runtime worktree add --no-checkout src/msys2-runtime &&
+
 sh -x ./update-patches.sh &&
 if test -n "$update_pkgver"
 then