From 2c6d3673a85d67a684a4d0518cf6fa6c578460f9 Mon Sep 17 00:00:00 2001 From: Wenju He Date: Fri, 21 Nov 2025 06:46:43 +0100 Subject: [PATCH] [CMake] Preserve non-PATCH brackets in title using git am --keep-non-patch (cherry picked from commit c274f33905fc33e944da777e64c8d26d9f364bd0) --- cmake/modules/CMakeFunctions.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/CMakeFunctions.cmake b/cmake/modules/CMakeFunctions.cmake index 13a013c6..ea540a41 100644 --- a/cmake/modules/CMakeFunctions.cmake +++ b/cmake/modules/CMakeFunctions.cmake @@ -134,7 +134,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 ${patch} + COMMAND ${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace ${patch} WORKING_DIRECTORY ${repo_dir} OUTPUT_VARIABLE patching_log )