Merged
Conversation
In the merging-rebase topology of the msys2-runtime, `git describe` picks the wrong base tag. For the current HEAD (based on Cygwin 3.6.9), `describe --match='cygwin-[0-9]*'` reports `cygwin-3.6.7-21396-g...` even though `cygwin-3.6.9` is a closer ancestor (21368 commits vs 21396). This causes line 63 of `update-patches.sh` to overwrite `pkgver` to `3.6.7` when it should be `3.6.9`. Replace `describe` with `for-each-ref --format='%(ahead-behind)'` sorted by distance, which correctly identifies the closest ancestor tag by commit count. The `sed` filter ensures only clean release tags (no `-dev` suffixes) are matched. Note: the `update-scripts/version/msys2-runtime` script in git-for-windows-automation has the same `describe` bug and will need a similar fix. Assisted-by: Claude Opus 4.6 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
msys2-runtime-6abc3bb22b40096e4a61b02e260e6934d82539b9
branch
from
b68467f to
324dfb4
Compare
dscho
changed the title
Member
|
/deploy The workflow run was started. |
dscho
deleted the
msys2-runtime-6abc3bb22b40096e4a61b02e260e6934d82539b9
branch
dscho
added a commit
to git-for-windows/git-for-windows-automation
that referenced
this pull request
Apr 28, 2026
When I tried to `/open-pr` [the MSYS2-packages PR to update to Cygwin runtime v3.6.9](git-for-windows/MSYS2-packages#285), it once again failed to determine the correct version. Instead of 3.6.9-1, it thought that I wanted to deploy 3.6.7-5. The fix requires git-for-windows/MSYS2-packages@01bfb78, and the corresponding change in `git-for-windows-automation`. This PR sports that change, along with two more fixes for issues I noticed while trying to reproduce the original issue.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This corresponds to git-for-windows/msys2-runtime#130