Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

apply_patches CMakeFunction shouldn't checkout existing branch #215

Open
PawelJurek opened this issue Nov 5, 2020 · 2 comments
Open

apply_patches CMakeFunction shouldn't checkout existing branch #215

PawelJurek opened this issue Nov 5, 2020 · 2 comments

Comments

@PawelJurek
Copy link
Contributor

Function "apply_patches" checks out the branch, where patches are applied if it already exists:

else() # The target branch already exists

I think the logic here might lead to unexpected issues, e.g. if you download new opencl-clang commit, where a new patch is introduced, it won't be applied if the branch is not manually deleted.

Maybe the function should delete the branch at first step?

@wenju-he
Copy link
Contributor

wenju-he commented Nov 6, 2020

yes I think the logic needs to be refined so that new patch will be applied.

@haonanya
Copy link

haonanya commented Jan 5, 2022

Besides, function that checks if the the patch is present in current local branch https://github.com/intel/opencl-clang/blob/ocl-open-100/cmake/modules/CMakeFunctions.cmake#L52 also doesn't work. It seems that commit id from one patch generated by git format-patch is always not same as the result from git am, see example from https://stackoverflow.com/questions/8550400/should-git-apply-or-git-am-come-up-with-the-same-hash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants