From f32b9c6b26cc8eab6eaa4f8803ef939a20ac9af0 Mon Sep 17 00:00:00 2001 From: Mathias Fredriksson Date: Tue, 23 Jul 2024 09:49:29 +0300 Subject: [PATCH] chore(scripts): fix cherry-pick check in `check_commit_metadata.sh` (#13980) (cherry picked from commit 5a4dbcfc02d7acc78be1e8e4312eec7b07808ba8) --- scripts/release/check_commit_metadata.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/release/check_commit_metadata.sh b/scripts/release/check_commit_metadata.sh index 507e8d8d797a7..dff4cb1c738fc 100755 --- a/scripts/release/check_commit_metadata.sh +++ b/scripts/release/check_commit_metadata.sh @@ -126,6 +126,7 @@ main() { log "Found renamed cherry-pick commit ${commit1} -> ${renamed}" renamed_cherry_pick_commits[${commit1}]=${renamed} renamed_cherry_pick_commits[${renamed}]=${commit1} + i=$((i - 1)) continue fi @@ -147,6 +148,11 @@ main() { log "Found matching cherry-pick commit ${commit} -> ${renamed_cherry_pick_commits[${commit}]}" done + # Merge the two maps. + for commit in "${!renamed_cherry_pick_commits[@]}"; do + cherry_pick_commits[${commit}]=${renamed_cherry_pick_commits[${commit}]} + done + # Get abbreviated and full commit hashes and titles for each commit. git_log_out="$(git log --no-merges --left-right --pretty=format:"%m %h %H %s" "${range}")" if [[ -z ${git_log_out} ]]; then