Use the git-for-windows-addons package if available
#659
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
Author
|
Here is a |
In git-for-windows/MINGW-packages#172, I split the `mingw-w64-git` package into several parts, preparing for a future where the same package definition is synchronized between Git for Windows and MSYS2. This meant splitting out the Git for Windows-specific parts into a new package called `mingw-w64-git-for-windows-addons`. This package has the newly split-out packages as dependencies that are requires to keep essentially the same files in Git for Windows' installer as before. So let's use that package instead of `mingw-w64-git`, when available. The change in this commit includes a minor bug fix in the `has_pacman_package` function, which did not verify that the directory it was looking for actually existed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The `makepkg-mingw` setup is somewhat surprising in that it clones the Git repository _twice_: Once as a bare repository, next to the `PKGBUILD`, and then as a non-bare repository (using the bare one as an alternate) into `src/`. Historically, we only needed to push the (potentially not-yet-published) tag to the `src/git/` repository. However, in an upcoming change, `mingw-w64-git`'s `PKGBUILD` will stop `SKIP`ping over the checksum of the tag, and verify it first. For this, the tag needs to be also present in the bare repository, so let's make it so. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In preparation for upstreaming `mingw-w64-git` to the MSYS2 project, the checksum of the tag needs to be recorded in the `PKGBUILD` file instead of `SKIP`ping over it. Therefore we need to update said checksum, otherwise the build will fail before it is started. Likewise, said checksum now has to be replaced _again_ when building the source package because the Git repository is replaced by a `.tar.gz` in that instance. See git-for-windows/MINGW-packages#172 for the full details. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
prepare-for-split-mingw-w64-git
branch
from
6fe5899 to
ace2be9
Compare
rimrul
approved these changes
Nov 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In git-for-windows/MINGW-packages#172, I split the
mingw-w64-gitpackage into several parts, preparing for a future where the same package definition is synchronized between Git for Windows and MSYS2.This meant splitting out the Git for Windows-specific parts into a new package called
mingw-w64-git-for-windows-addons. This package has the newly split-out packages as dependencies that are requires to keep essentially the same files in Git for Windows' installer as before. So let's use that package instead ofmingw-w64-git, when available.