Skip to content

TOOL-21469 Allow empty commits when cherry-picking in kernel repos #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

TOOL-21469 Allow empty commits when cherry-picking in kernel repos #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion default-package-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ function kernel_merge_with_upstream() {
logmust git checkout -q -b repo-HEAD upstream-HEAD

# shellcheck disable=SC2086
logmust git cherry-pick ${dlpx_patch_start}^..${dlpx_patch_end}
logmust git cherry-pick --allow-empty ${dlpx_patch_start}^..${dlpx_patch_end}

logmust touch "$WORKDIR/repo-updated"
}
Expand Down