@@ -57,7 +57,6 @@ function(is_backport_patch_present patch_path repo_dir patch_in_branch)
57
57
WORKING_DIRECTORY ${repo_dir}
58
58
RESULT_VARIABLE patch_not_in_branches
59
59
OUTPUT_QUIET
60
- ERROR_QUIET
61
60
)
62
61
if (patch_not_in_branches )
63
62
set (patch_in_branch False PARENT_SCOPE ) # The patch is not present in local branch
@@ -74,7 +73,6 @@ function(is_valid_revision repo_dir revision return_val)
74
73
COMMAND ${GIT_EXECUTABLE} log -1 ${revision}
75
74
WORKING_DIRECTORY ${repo_dir}
76
75
RESULT_VARIABLE output_var
77
- ERROR_QUIET
78
76
OUTPUT_QUIET
79
77
)
80
78
if (${output_var} EQUAL 0 )
@@ -106,7 +104,6 @@ function(apply_patches repo_dir patches_dirs base_revision target_branch ret)
106
104
COMMAND ${GIT_EXECUTABLE} rev-parse --verify --no-revs -q ${target_branch}
107
105
WORKING_DIRECTORY ${repo_dir}
108
106
RESULT_VARIABLE patches_needed
109
- ERROR_QUIET
110
107
OUTPUT_QUIET
111
108
)
112
109
if (patches_needed EQUAL 128 ) # not a git repo
@@ -122,7 +119,6 @@ function(apply_patches repo_dir patches_dirs base_revision target_branch ret)
122
119
WORKING_DIRECTORY ${repo_dir}
123
120
OUTPUT_VARIABLE repo_head
124
121
OUTPUT_STRIP_TRAILING_WHITESPACE
125
- ERROR_QUIET
126
122
)
127
123
message (STATUS "[OPENCL-CLANG] ref ${base_revision} not exists in repository, using current HEAD:${repo_head} " )
128
124
set (base_revision ${repo_head} )
@@ -142,10 +138,9 @@ function(apply_patches repo_dir patches_dirs base_revision target_branch ret)
142
138
message (STATUS "[OPENCL-CLANG] Patch ${patch} is already in local branch - ignore patching" )
143
139
else ()
144
140
execute_process ( # Apply the patch
145
- COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace ${patch}
141
+ COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ${patch}
146
142
WORKING_DIRECTORY ${repo_dir}
147
143
OUTPUT_VARIABLE patching_log
148
- ERROR_QUIET
149
144
RESULT_VARIABLE ret_apply_patch
150
145
)
151
146
message (STATUS "[OPENCL-CLANG] Not present - ${patching_log} " )
@@ -159,7 +154,6 @@ function(apply_patches repo_dir patches_dirs base_revision target_branch ret)
159
154
COMMAND ${GIT_EXECUTABLE} checkout ${target_branch}
160
155
WORKING_DIRECTORY ${repo_dir}
161
156
RESULT_VARIABLE ret_check_out
162
- ERROR_QUIET
163
157
OUTPUT_QUIET
164
158
)
165
159
endif ()
0 commit comments