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

palash-gandhi · palash-gandhi · commit 5a39ba12b953 · 2023-05-31T09:59:12.000-07:00
diff --git a/default-package-config.sh b/default-package-config.sh
@@ -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"
 }

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ function kernel_merge_with_upstream() {`
`413`	`413`	`logmust git checkout -q -b repo-HEAD upstream-HEAD`
`414`	`414`
`415`	`415`	`# shellcheck disable=SC2086`
`416`		`- logmust git cherry-pick ${dlpx_patch_start}^..${dlpx_patch_end}`
	`416`	`+ logmust git cherry-pick --allow-empty ${dlpx_patch_start}^..${dlpx_patch_end}`
`417`	`417`
`418`	`418`	`logmust touch "$WORKDIR/repo-updated"`
`419`	`419`	`}`