[CMake] Preserve non-PATCH brackets in title using git am --keep-non-patch (#598)

wenju-he · web-flow · commit 8aab8ba87da5 · 2025-11-24T10:12:12.000+08:00
(cherry picked from commit c274f33)
diff --git a/cmake/modules/CMakeFunctions.cmake b/cmake/modules/CMakeFunctions.cmake
@@ -136,7 +136,7 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
                 message(STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching")
             else()
                 execute_process( # Apply the patch
-                    COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ${patch}
+                    COMMAND ${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ${patch}
                     WORKING_DIRECTORY ${repo_dir}
                     OUTPUT_VARIABLE patching_log
                 )

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)`
`136`	`136`	`message(STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching")`
`137`	`137`	`else()`
`138`	`138`	`execute_process( # Apply the patch`
`139`		`- COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ${patch}`
	`139`	`+ COMMAND ${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ${patch}`
`140`	`140`	`WORKING_DIRECTORY ${repo_dir}`
`141`	`141`	`OUTPUT_VARIABLE patching_log`
`142`	`142`	`)`