[ocl-open-170] Apply patches with git apply when no .git history is present - #881
Open
wenju-he wants to merge 1 commit into
Open
[ocl-open-170] Apply patches with git apply when no .git history is present#881wenju-he wants to merge 1 commit into
wenju-he wants to merge 1 commit into
Conversation
Sources extracted from a tarball (e.g. Nix, or other reproducible builds that avoid full git clones of llvm-project) have no .git directory, so the existing git-am/branch-based patching silently skipped all patches. Fall back to plain `git apply`, which only needs the working tree content to match the patch context and works without any git repository or history. Idempotency across reconfigures is tracked with a marker file instead of a git branch. Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
wenju-he
changed the title
wenju-he
enabled auto-merge (squash)
August 24, 2026 04:19
wenju-he
disabled auto-merge
August 24, 2026 04:19
cdai2
approved these changes
Aug 24, 2026
cdai2
left a comment
cdai2
left a comment
Contributor
There was a problem hiding this comment.
LGTM.
Is there a test to cover this case? I believe there isn't one currently.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Sources extracted from a tarball (e.g. Nix, or other reproducible builds that avoid full git clones of llvm-project) have no .git directory, so the existing git-am/branch-based patching silently skipped all patches. Fall back to plain
git apply, which only needs the working tree content to match the patch context and works without any git repository or history. Idempotency across reconfigures is tracked with a marker file instead of a git branch.