Merge pull request #157: Update Git to include race condition fix in …

…gvfs-helper Resolves #156. See microsoft/git#205 for the Git code change. One race condition still existed: who creates the loose object _directory_ first? The simple change is to check if the directory exists after the mkdir fails.
microsoft · Oct 5, 2019 · 7d437dc · 7d437dc
2 parents a3613f8 + 6340637
commit 7d437dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Scalar.Build/Scalar.props b/Scalar.Build/Scalar.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <ScalarVersion>0.2.173.2</ScalarVersion>
-    <GitPackageVersion>2.20191003.3-sc</GitPackageVersion>
+    <GitPackageVersion>2.20191004.2-sc</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs b/Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs
@@ -218,7 +218,7 @@ private void LoadBlobsViaGit(ScalarFunctionalTestEnlistment enlistment)
         {
             // 'git rev-list --objects' will check for all objects' existence, which
             // triggers an object download on every missing blob.
-            ProcessResult result = GitHelpers.InvokeGitAgainstScalarRepo(enlistment.RepoRoot, "rev-list --objects HEAD^{tree}");
+            ProcessResult result = GitHelpers.InvokeGitAgainstScalarRepo(enlistment.RepoRoot, "rev-list --all --objects");
             result.ExitCode.ShouldEqual(0, result.Errors);
         }
     }