Skip to content

Commit

Permalink
chore: Update cherry-pick.sh (#12486)
Browse files Browse the repository at this point in the history
Signed-off-by: Yuan Tang <[email protected]>
  • Loading branch information
terrytangyuan committed Jan 8, 2024
1 parent 98b578e commit 6a0891e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hack/cherry-pick.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ git log --oneline --grep "${commitGrepPattern}" "$base...main" | while read -r m
else
commit=$(grep -q "$(echo "$m" | prNo)" /tmp/prs && echo "${m:0:9}")
echo "cherry-picking: $commit"
if ! git cp "$commit"; then
if ! git cherry-pick "$commit"; then
echo "failed to cherry-pick $commit"
git cp --abort
git cherry-pick --abort
fi
fi
done

0 comments on commit 6a0891e

Please sign in to comment.