diff options
Diffstat (limited to 'community/dotnet6-stage0/vstest_use-work-tree-with-git.patch')
| -rw-r--r-- | community/dotnet6-stage0/vstest_use-work-tree-with-git.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/community/dotnet6-stage0/vstest_use-work-tree-with-git.patch b/community/dotnet6-stage0/vstest_use-work-tree-with-git.patch deleted file mode 100644 index 4216d533e0e..00000000000 --- a/community/dotnet6-stage0/vstest_use-work-tree-with-git.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b2c4b2427d8c1a2410c4210789caccf1ec87e64a Mon Sep 17 00:00:00 2001 -Patch-Source: https://pagure.io/dotnet-sig/dotnet6.0/raw/main/f/vstest-use-work-tree-with-git-apply.patch -From: Omair Majid <omajid@redhat.com> -Date: Thu, 9 Sep 2021 13:21:51 -0400 -Subject: [PATCH] [ArPow] Use --work-tree with git apply - -This makes things work better in a source-tarball build, where there may -be a .git directory somewhere in our parent directories but it's for a -different repo than vstest. In a situation like that a plain `git apply` -will (silently!) ignore patches because they wont apply to the unrelated -repository. That will (eventually) make the source-build fail. -`--work-tree` makes git directly use the directory that we care about. - -See https://github.com/dotnet/source-build/issues/2445 for more details. ---- - eng/SourceBuild.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props -index b365645c..68f82592 100644 ---- a/eng/SourceBuild.props -+++ b/eng/SourceBuild.props -@@ -24,7 +24,7 @@ - </ItemGroup> - - <Exec -- Command="git apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)"" -+ Command="git --work-tree="$(InnerSourceBuildRepoRoot)" apply --ignore-whitespace --whitespace=nowarn "%(SourceBuildPatchFile.FullPath)"" - WorkingDirectory="$(InnerSourceBuildRepoRoot)" - Condition="'@(SourceBuildPatchFile)' != ''" /> - </Target> --- -2.31.1 |