Skip to content

Commit

Permalink
ci/update: drop empty commits on re-apply
Browse files Browse the repository at this point in the history
  • Loading branch information
MattSturgeon committed Feb 24, 2025
1 parent 0598100 commit 4b0de83
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,10 @@ jobs:
if [[ -n "$commits" ]]; then
echo "Applying ${#commits[@]} commits..."
echo "count=${#commits[@]}" >> $GITHUB_OUTPUT
git cherry-pick --strategy-option=theirs "${commits[@]}"
git cherry-pick \
--strategy-option=theirs \
--empty=drop \
"${commits[@]}"
else
echo "Nothing to re-apply"
fi
Expand Down

0 comments on commit 4b0de83

Please sign in to comment.