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

[Backport] Do not apply patches if sub non-git repo is located in a git repo. #540

Merged
merged 2 commits into from
Aug 26, 2024

Conversation

haonanya
Copy link

@haonanya haonanya commented Jul 3, 2024

[Backport] Do not apply patches if repo is a not a git repo. #539
[Backport] Do not apply patches if sub non-git repo is located in a git repo. #545
Also add an option to control patch apply which is default on. Pass -DAPPLY_PATCHES=OFF will skip patch apply process.

set(ret_not_git_repo 1)
elseif(patches_needed) # The target branch doesn't exist
set(${ret} True PARENT_SCOPE)
message(STATUS "[OPENCL-CLANG] ${repo_dir} is not a git repository")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sync message with 140 branch?

…it repo.

Also add an option to control patch apply which is default on. Pass -DAPPLY_PATCHES=OFF will skip patch apply process.
@haonanya haonanya changed the title Do not apply patches if repo is a not a git repo. [Backport] Do not apply patches if sub non-git repo is located in a git repo. Aug 26, 2024
Copy link
Contributor

@wenju-he wenju-he left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@haonanya haonanya merged commit 5824297 into intel:ocl-open-150 Aug 26, 2024
1 check passed
@haonanya haonanya deleted the fix-git-return-150 branch August 26, 2024 08:31
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

Successfully merging this pull request may close these issues.

3 participants