We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent b8cd348 commit 85c1114Copy full SHA for 85c1114
cmake/modules/CMakeFunctions.cmake
@@ -140,7 +140,7 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
140
message(STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching")
141
else()
142
execute_process( # Apply the patch
143
- COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ${patch}
+ COMMAND ${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ${patch}
144
WORKING_DIRECTORY ${repo_dir}
145
OUTPUT_VARIABLE patching_log
146
RESULT_VARIABLE ret_apply_patch
0 commit comments