You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: vendor/knative.dev/hack/release.sh
+2-2Lines changed: 2 additions & 2 deletions
Original file line number
Diff line number
Diff line change
@@ -219,9 +219,9 @@ function prepare_dot_release() {
219
219
# Use the original tag (ie. potentially with a knative- prefix) when determining the last version commit sha
220
220
local github_tag="$(gh_tool release list --json tagName --jq '.[].tagName'| grep "${last_version}")"
221
221
local last_release_commit="$(git rev-list -n 1 "${github_tag}")"
222
-
local last_release_commit_filtered="$(git rev-list --invert-grep --grep "\[skip-dot-release\]"-n 1 "${github_tag}")"
222
+
local last_release_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]'-n 1 "${github_tag}")"
223
223
local release_branch_commit="$(git rev-list -n 1 upstream/"${RELEASE_BRANCH}")"
224
-
local release_branch_commit_filtered="$(git rev-list --invert-grep --grep "\[skip-dot-release\]" -n 1 upstream/"${RELEASE_BRANCH}")"
224
+
local release_branch_commit_filtered="$(git rev-list --invert-grep --grep '^(?!\s*>).*?\[skip-dot-release\]' -n 1 upstream/"${RELEASE_BRANCH}")"
225
225
[[ -n"${last_release_commit}" ]] || abort "cannot get last release commit"
226
226
[[ -n"${release_branch_commit}" ]] || abort "cannot get release branch last commit"
227
227
echo"Version ${last_version} is at commit ${last_release_commit}. Comparing using ${last_release_commit_filtered}. If it is different is because commits with the [skip-dot-release] flag in their commit body are not being considered."
0 commit comments