Skip to content

git: fix the pkgver#182

Merged
dscho merged 2 commits intomainfrom
fix-the-pkgver-of-git
Feb 4, 2026
Merged

git: fix the pkgver#182
dscho merged 2 commits intomainfrom
fix-the-pkgver-of-git

Conversation

@dscho
Copy link
Member

@dscho dscho commented Feb 3, 2026

In 363b1e7 (git: drop the commit hash from pkgver for MSYS2 compatibility, 2025-11-14), I dropped the auto-updating logic of pkgver, forgetting that Git for Windows' automation would not update that line. As a consequence, the Pacman packages built as part of Git for Windows' v2.53.0 release process incorrectly reference the previous pkgver and the Git for Windows SDKs do not enjoy the update.

Let's fix that by switching to a Bash'ism (which is fine, given that makepkg contains so many Bash'isms that it is highly implausible that it will ever work with any other Unix shell).

In 363b1e7 (git: drop the commit hash from pkgver for MSYS2
compatibility, 2025-11-14), I dropped the auto-updating logic of
`pkgver`, forgetting that Git for Windows' automation would not update
that line. As a consequence, the Pacman packages built as part of Git
for Windows' v2.53.0 release process incorrectly reference the previous
pkgver and the Git for Windows SDKs do not enjoy the update.

Let's fix that by switching to a Bash'ism (which is fine, given that
`makepkg` contains _so many_ Bash'isms that it is highly implausible
that it will ever work with any other Unix shell).

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Feb 3, 2026
@dscho
Copy link
Member Author

dscho commented Feb 3, 2026

I guess I should update pkgrel to 2 and /deploy...

@dscho dscho requested review from mjcheetham and rimrul February 3, 2026 09:46
By mistake, the Pacman packages generated as part of Git for Windows'
v2.53.0 release process contain the previous version number, and are
therefore not picked up by `pacman -Syu`.

Let's just rebuild and deploy the package, but with an incremented
pkgrel so that it is obvious why the executables contained in that
package differ from the ones in the official Git for Windows release.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho

This comment was marked as outdated.

@dscho
Copy link
Member Author

dscho commented Feb 3, 2026

/deploy mingw-w64-git

The i686/x86_64 and the arm64 workflow runs were started.

@dscho
Copy link
Member Author

dscho commented Feb 4, 2026

Unfortunately, the deployment failed with "Failed: HTTP/1.1 413 The request body is too large and exceeds the maximum permissible limit."

The reason for that is this line: https://github.com/git-for-windows/build-extra/blob/70e451a41639278c27933290ef7f874771993b45/wingit-snapshot-helper.sh#L137

This limits the API version we use to upload to Azure Blobs, which in turn limits the size of the package we can upload to <256MB. The mingw-w64-git source package is larger, because it includes the bare git.git repository; Currently the source package weighs 391MB as a consequence. Almost 3 years ago, I added a workaround in git-for-windows/build-extra@8e762c3 (please.sh build-mingw-w64-git: make a smarter source package, faster, 2023-03-03) for that, replacing the bare repository by the source archive.

I've fixed the deployment manually, using the fact that Azure Blobs allows larger uploads in the meantime (which I could have realized in 2023, seeing as API version 2019-12-12 allows larger uploads).

So with that, this PR is good to be merged!

@dscho dscho merged commit 5c58f16 into main Feb 4, 2026
4 of 5 checks passed
@dscho dscho deleted the fix-the-pkgver-of-git branch February 4, 2026 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants