From d7f05a9c230b884ab69850069c62ec5920beafde Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 23 May 2025 16:14:28 +0200 Subject: [PATCH 1/2] git-extra: rename the local copy of the Pacman database as needed Recently we switched from the old Pacman repository that was hosted on Azure Blobs in my personal Azure account to the new one that is hosted at https://github.com/git-for-windows/pacman-repo. To make that work, we needed to rename the Pacman database from the generic `git-for-windows.db` to `git-for-windows-.db` where `` is the architecture of the current MSYS2 runtime. Unfortunately, the `sync` workflow of the `git-sdk-*` repositories was not quite prepared for that rename and could no longer find the `mingw-w64-git-extra` package to install. Side note: This did not affect the `git-sdk-32` repository because that is stuck with an older Pacman version that did not quite care about the current version of the `mingw-w64-git-extra` package when being asked to reinstall it. Let's make sure that the database file is renamed as appropriate. Signed-off-by: Johannes Schindelin --- git-extra/git-extra.install.in | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git-extra/git-extra.install.in b/git-extra/git-extra.install.in index 9e6f713029..45d9aac55d 100644 --- a/git-extra/git-extra.install.in +++ b/git-extra/git-extra.install.in @@ -108,6 +108,18 @@ GITATTRIBUTES ! grep -q 'https://dl.bintray.com/git-for-windows/pacman/x86_64' etc/pacman.conf || sed -i -e 's/https:\/\/dl\.bintray\.com\/git-for-windows\/pacman\/x86_64/https:\/\/wingit.blob.core.windows.net\/x86-64/g' etc/pacman.conf + # The main pacman database was renamed from `git-for-windows` to `git-for-windows-` + for ext in db db.sig files files.sig + do + if ! test -f var/lib/pacman/sync/git-for-windows-$arch.$ext + then + mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-$arch.$ext + elif test -f var/lib/pacman/sync/git-for-windows.$ext + then + rm var/lib/pacman/sync/git-for-windows.$ext + fi + done + test i686 != $"uname -m" || case "$(md5sum.exe < /msys2.ico)" in 292ad5cd*) cp /usr/share/git/msys2-32.ico /msys2.ico;; From f3272c1471311ac740a58832eb66e04d5d59fce8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 23 May 2025 16:32:15 +0200 Subject: [PATCH 2/2] git-extra: commit generated files Signed-off-by: Johannes Schindelin --- git-extra/PKGBUILD | 2 +- git-extra/git-extra.install | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/git-extra/PKGBUILD b/git-extra/PKGBUILD index 101afe37a3..85f67ca21b 100644 --- a/git-extra/PKGBUILD +++ b/git-extra/PKGBUILD @@ -5,7 +5,7 @@ pkgbase="mingw-w64-${_realname}" pkgname=($_realname "${MINGW_PACKAGE_PREFIX}-${_realname}") _ver_base=1.1 -pkgver=1.1.655.d4631bf56 +pkgver=1.1.657.d7f05a9c2 pkgrel=1 pkgdesc="Git for Windows extra files" arch=('any') diff --git a/git-extra/git-extra.install b/git-extra/git-extra.install index ccdfa7800f..8a324a4c5a 100644 --- a/git-extra/git-extra.install +++ b/git-extra/git-extra.install @@ -142,6 +142,18 @@ GITATTRIBUTES ! grep -q 'https://dl.bintray.com/git-for-windows/pacman/x86_64' etc/pacman.conf || sed -i -e 's/https:\/\/dl\.bintray\.com\/git-for-windows\/pacman\/x86_64/https:\/\/wingit.blob.core.windows.net\/x86-64/g' etc/pacman.conf + # The main pacman database was renamed from `git-for-windows` to `git-for-windows-` + for ext in db db.sig files files.sig + do + if ! test -f var/lib/pacman/sync/git-for-windows-$arch.$ext + then + mv var/lib/pacman/sync/git-for-windows.$ext var/lib/pacman/sync/git-for-windows-$arch.$ext + elif test -f var/lib/pacman/sync/git-for-windows.$ext + then + rm var/lib/pacman/sync/git-for-windows.$ext + fi + done + test i686 != $"uname -m" || case "$(md5sum.exe < /msys2.ico)" in 292ad5cd*) cp /usr/share/git/msys2-32.ico /msys2.ico;;