Skip to content

chore(scripts): fix expression interpreted as exit code on some Bash versions #13417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
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
11 changes: 5 additions & 6 deletions scripts/release/check_commit_metadata.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,20 +122,19 @@ main() {
fi

if [[ ${title1} != "${title2}" ]]; then
log "Invariant failed, cherry-picked commits have different titles: ${title1} != ${title2}, attempting to check commit body for cherry-pick information..."
log "Invariant failed, cherry-picked commits have different titles: \"${title1%$'\n'}\" != \"${title2%$'\n'}\", attempting to check commit body for cherry-pick information..."

renamed=$(git show "${commit1}" | sed -ne 's/.*cherry picked from commit \([0-9a-f]*\).*/\1/p')
if [[ -n ${renamed} ]]; then
log "Found renamed cherry-pick commit ${commit1} -> ${renamed}"
renamed_cherry_pick_commits[${commit1}]=${renamed}
renamed_cherry_pick_commits[${renamed}]=${commit1}
continue
else
log "Not a cherry-pick commit, adding ${commit1} to pending list..."
renamed_cherry_pick_commits_pending+=("${commit1}")
fi
# error "Invariant failed, cherry-picked commits have different titles: ${title1} != ${title2}"
((i--))

log "Not a cherry-pick commit, adding ${commit1} to pending list..."
renamed_cherry_pick_commits_pending+=("${commit1}")
i=$((i - 1))
continue
fi

Expand Down
Loading