Fix failure to sort properly with prefix, sort double numbers (#43 #44). #46
Conversation
This file contains 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
john-tipper
force-pushed
the
fix-43-44
branch
from
c22a2d8
to
d791793
Compare
endavid
reviewed
Nov 2, 2020
| @@ -172,17 +172,22 @@ version-parse-pre-release() { | |||
| version-get() { | |||
| local sort_args version version_pre_releases pre_release_id_count pre_release_id_index | |||
| local tags=$(git tag) | |||
| local sorted_tags=$( | |||
| echo "$tags" | | |||
| grep -oP "^${VERSION_PREFIX}\K[0-9]+\.[0-9]+\.[0-9]+.*" | | |||
There was a problem hiding this comment.
This breaks on macOS because the P option does not exist.
In macOS, I replaced it with this and it worked:
perl -nle "m/^${VERSION_PREFIX}\K[0-9]+\.[0-9]+\.[0-9]+.*/ && print $&"
cmperaza
added a commit
to Whatnot-Inc/git-semver
that referenced
this pull request
Feb 16, 2022
cmperaza
added a commit
to Whatnot-Inc/git-semver
that referenced
this pull request
Feb 16, 2022
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.
Tags were not being sorted properly if there was a prefix, as the numerical sort included the prefix in the first sort field. We grep this out via a capture group of the remainder of the tag, sort, then add the prefix back in if required. This also fixes the issue with double numbers.
The version being reported in
getto the user (at the end ofversion-get()) was using an unsorted list of tags, so use the new sorted list for actually getting the version.