[ArPow] Use --work-tree with git apply #4254
Merged
Conversation
This file contains 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
This makes things work bettern in a source-tarball build (where there may not be a .git directory), or there might be a .git directory but it's for a different repo than the one we are building.
ghost
added
the
|
cc @dotnet/source-build-contrib |
|
Hm... @dotnet/source-build-contrib isn't working? |
zivkan
approved these changes
Sep 9, 2021
omajid
commented
Sep 9, 2021
| @@ -55,7 +55,7 @@ | |||
| </ItemGroup> | |||
|
|
|||
| <Exec | |||
| Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)"" | |||
| Command="git --work-tree=$(ProjectRoot) apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)"" | |||
There was a problem hiding this comment.
I used ProjectRoot based on the WorkingDirectory set on the next line; is there a better variable name I should be using instead?
aortiz-msft
approved these changes
Sep 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Bug
Fixes: NuGet/Home#11227
Regression? Last working version: Not a really a regression in NuGet.Client, though it is a regression from source-build 5.0.
Description
See the issue for details about the problem and how to reproduce.
Use
git --work-tree=path applyto ensure thatgit applyworks even if the sources are copied somewhere else or the.gitdirectory is removed and the code just happens to be placed somewhere under a git repository.This is the same fix that's used everywhere else within ArPow: https://github.com/dotnet/installer/blob/74507010fafeb931a063f8649bff0b032ebc725b/src/SourceBuild/tarball/content/repos/Directory.Build.targets#L83
PR Checklist
PR has a meaningful title
PR has a linked issue.
Described changes
Tests
Documentation