Skip to content

Commit 85c1114

Browse files
authored
[CMake] Preserve non-PATCH brackets in title using git am --keep-non-patch (#601)
(cherry picked from commit c274f33)
1 parent b8cd348 commit 85c1114

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cmake/modules/CMakeFunctions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
140140
message(STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching")
141141
else()
142142
execute_process( # Apply the patch
143-
COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ${patch}
143+
COMMAND ${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ${patch}
144144
WORKING_DIRECTORY ${repo_dir}
145145
OUTPUT_VARIABLE patching_log
146146
RESULT_VARIABLE ret_apply_patch

0 commit comments

Comments
 (0)