Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion release-portlet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ CURRENT=$(git rev-parse --abbrev-ref HEAD)
[[ "$CURRENT" == "$BRANCH" ]] || fail "on '$CURRENT', expected '$BRANCH'"
ok "on branch $BRANCH"

git fetch upstream "$BRANCH" --tags --quiet
# --force so a stale local tag (e.g. one re-cut on upstream during an earlier
# release) can't fail the fetch and silently abort the script under `set -e`.
git fetch upstream "$BRANCH" --tags --force --quiet
LOCAL_HEAD=$(git rev-parse HEAD)
UPSTREAM_HEAD=$(git rev-parse "upstream/$BRANCH")
if [[ "$LOCAL_HEAD" != "$UPSTREAM_HEAD" ]]; then
Expand Down
Loading