Skip to content

Commit 7d437dc

Browse files
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.
2 parents a3613f8 + 6340637 commit 7d437dc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Scalar.Build/Scalar.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup Label="Parameters">
55
<ScalarVersion>0.2.173.2</ScalarVersion>
6-
<GitPackageVersion>2.20191003.3-sc</GitPackageVersion>
6+
<GitPackageVersion>2.20191004.2-sc</GitPackageVersion>
77
</PropertyGroup>
88

99
<PropertyGroup Label="DefaultSettings">

Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private void LoadBlobsViaGit(ScalarFunctionalTestEnlistment enlistment)
218218
{
219219
// 'git rev-list --objects' will check for all objects' existence, which
220220
// triggers an object download on every missing blob.
221-
ProcessResult result = GitHelpers.InvokeGitAgainstScalarRepo(enlistment.RepoRoot, "rev-list --objects HEAD^{tree}");
221+
ProcessResult result = GitHelpers.InvokeGitAgainstScalarRepo(enlistment.RepoRoot, "rev-list --all --objects");
222222
result.ExitCode.ShouldEqual(0, result.Errors);
223223
}
224224
}

0 commit comments

Comments
 (0)