diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-03-09 09:04:09 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-03-09 09:05:21 +0100 |
| commit | b88700bd4bfb1f338b43add2f9e0b1b86edda1a4 (patch) | |
| tree | c4cf3c6471563ce94aa93de38eecefb13b7610ac | |
| parent | c22703b68dab077c88cf88424eecf7d43926d69a (diff) | |
| download | NetworkManager-b88700bd4bfb1f338b43add2f9e0b1b86edda1a4.tar.gz | |
release: fix honoring $ORIGIN environment variable
| -rwxr-xr-x | contrib/fedora/rpm/release.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/release.sh b/contrib/fedora/rpm/release.sh index 977b239156..d7c14a9700 100755 --- a/contrib/fedora/rpm/release.sh +++ b/contrib/fedora/rpm/release.sh @@ -32,7 +32,8 @@ # Also, ensure you have a GPG key that you want to use for signing. Also, have gpg-agent running # and possibly configure `git config --get user.signingkey` for the proper key. # -# * Your git repository needs a remote "origin" that points to the upstream git repository. +# * Your git repository needs a remote "origin" that points to the upstream git repository +# (or set $ORIGIN) and use the standard git refs/remotes/$ORIGIN/ branch names. # # * All your (relevant) local branches (main and nm-1-*) must be up to date with their # remote tracking branches for origin. @@ -367,7 +368,7 @@ if [ -n "$RELEASE_BRANCH" ]; then fi if [ "$ALLOW_LOCAL_BRANCHES" != 1 ]; then - cmp <(git show origin/main:contrib/fedora/rpm/release.sh) "$BASH_SOURCE_ABSOLUTE" || die "$BASH_SOURCE is not identical to \`git show origin/main:contrib/fedora/rpm/release.sh\`" + cmp <(git show "$ORIGIN/main:contrib/fedora/rpm/release.sh") "$BASH_SOURCE_ABSOLUTE" || die "$BASH_SOURCE is not identical to \`git show \"$ORIGIN/main:contrib/fedora/rpm/release.sh\"\`" fi if ! check_news "$RELEASE_MODE" "@{VERSION_ARR[@]}" ; then |