Skip to content

Commit e21be8b

Browse files
hfmehmedKSP Auto Pick
authored andcommitted
Update auto-merge.yml to allow empty commit
(cherry picked from commit 72e80b6)
1 parent dba070e commit e21be8b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
VERSION_BUMPS=$(git log $MERGE_BASE..origin/main --pretty=%H --grep UPDATE_KOTLIN_VERSION)
4141
TO_PICK=$(grep -Fxv -f <(echo "$PICKED"; echo "$VERSION_BUMPS"; echo "$DONT_PICK") <(echo "$CANDIDATES") | awk '{a[i++]=$0} END {for (j=i-1; j>=0;) print a[j--] }')
4242
echo Picking $TO_PICK
43-
if [ -n "$TO_PICK" ]; then git cherry-pick -x $TO_PICK; fi
43+
if [ -n "$TO_PICK" ]; then git cherry-pick -x --allow-empty $TO_PICK; fi
4444
4545
- name: Setup Java 17
4646
uses: actions/[email protected]

0 commit comments

Comments
 (0)