File tree Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Expand file tree Collapse file tree 1 file changed +12
-0
lines changed Original file line number Diff line number Diff line change @@ -35,16 +35,28 @@ function(apply_patches repo_dir patches_dir base_revision target_branch)
35
35
execute_process ( # Create the target branch
36
36
COMMAND ${GIT_EXECUTABLE} checkout -b ${target_branch} ${base_revision}
37
37
WORKING_DIRECTORY ${repo_dir}
38
+ RESULT_VARIABLE es
38
39
)
40
+ if (NOT es EQUAL 0 )
41
+ message (FATAL_ERROR "Could not checkout base revision" )
42
+ endif ()
39
43
execute_process ( # Apply the pathces
40
44
COMMAND ${GIT_EXECUTABLE} am --3way --ignore-whitespace ${patches}
41
45
WORKING_DIRECTORY ${repo_dir}
46
+ RESULT_VARIABLE es
42
47
)
48
+ if (NOT es EQUAL 0 )
49
+ message (FATAL_ERROR "Could not apply SPIRV patches" )
50
+ endif ()
43
51
else () # The target branch already exists
44
52
execute_process ( # Check it out
45
53
COMMAND ${GIT_EXECUTABLE} checkout ${target_branch}
46
54
WORKING_DIRECTORY ${repo_dir}
55
+ RESULT_VARIABLE es
47
56
)
57
+ if (NOT es EQUAL 0 )
58
+ message (FATAL_ERROR "Could not checkout branch" )
59
+ endif ()
48
60
endif ()
49
61
endfunction ()
50
62
You can’t perform that action at this time.
0 commit comments