mirror/nix-community.nixvim
1
0
Fork 0
mirror of https://github.com/nix-community/nixvim.git synced 2025-06-21 00:25:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/update: drop empty commits on re-apply

Browse source
This commit is contained in:
Matt Sturgeon 2025-02-24 16:04:29 +00:00
parent 05981008b7
commit 4b0de83c39
No known key found for this signature in database
GPG key ID: 4F91844CED1A8299
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/update.yml vendored
View file

@ -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