system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-20 17:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

contrib: improve code comments to release.sh scripts

Browse source
This commit is contained in:
Thomas Haller 2020-07-13 23:54:34 +02:00
parent 7b14686ae2
commit aa4cb0e5eb
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/fedora/rpm/release.sh
View file

@ -4,7 +4,7 @@
#
# Run with --help for usage.
#
# There are 5 modes:
# There are 6 modes:
#
# - "devel" : on master branch to tag "1.25.2-dev"
# - "rc1" : the first release candidate on "master" branch which branches off
@ -367,6 +367,11 @@ case "$RELEASE_MODE" in
TAR_VERSION="$b"
;;
major-post)
# We create a merge commit with the content of current "master", with two
# parent commits $THE_RELEASE and "master". But we want that the first parent
# is the release, so that `git log --first-parent` follows the path with the
# release candidates, and not the devel part during that time. Hence this
# switcheroo here.
git checkout -B "$TMP_BRANCH" "${VERSION_ARR[0]}.$((${VERSION_ARR[1]} - 1)).0" || die "merge0"
git merge -Xours --commit -m tmp master || die "merge1"
git rm --cached -r . || die "merge2"