cwinfo/yggdrasil-go
5
0
Fork 0
mirror of https://github.com/cwinfo/yggdrasil-go.git synced 2024-11-25 07:11:36 +00:00
Code Releases Activity

Hopefully fix semver versioning breakage caused by non-master merge commits

Browse Source
This commit is contained in:
Neil Alexander 2018-12-17 22:07:28 +00:00
parent 0a9b34d121
commit a22da8009f
No known key found for this signature in database
GPG Key ID: A02A2019A2BB0944
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/semver/version.sh
View File

@ -10,7 +10,7 @@ TAG=$(git describe --abbrev=0 --tags --match="v[0-9]*\.[0-9]*\.0" 2>/dev/null)
MERGE=$(git rev-list $TAG..master --grep "from $DEVELOPBRANCH" 2>/dev/null | head -n 1) MERGE=$(git rev-list $TAG..master --grep "from $DEVELOPBRANCH" 2>/dev/null | head -n 1)
# Get the number of merges since the last merge to master # Get the number of merges since the last merge to master
PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" 2>/dev/null) PATCH=$(git rev-list $TAG..master --count --merges --grep="from $DEVELOPBRANCH" --first-parent master 2>/dev/null)
# Decide whether we should prepend the version with "v" - the default is that # Decide whether we should prepend the version with "v" - the default is that
# we do because we use it in git tags, but we might not always need it # we do because we use it in git tags, but we might not always need it