summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-07-13 23:54:34 +0200
committerThomas Haller <thaller@redhat.com>2020-07-13 23:54:34 +0200
commitaa4cb0e5ebff3102dc8b82ac08471096bad39192 (patch)
tree5efbf34888b3c9893d70300b1a70b94eba0f0164
parent7b14686ae2b0d610661af1958062c5388c0cb6bf (diff)
downloadNetworkManager-aa4cb0e5ebff3102dc8b82ac08471096bad39192.tar.gz
contrib: improve code comments to release.sh scripts
-rwxr-xr-xcontrib/fedora/rpm/release.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh
index 549a4069e9..737eabdf84 100755
--- a/contrib/fedora/rpm/release.sh
+++ b/contrib/fedora/rpm/release.sh
@@ -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"