Skip to content

Commit 9dc5ce8

Browse files
Merge pull request #165: Update Git to include gvfs-helper update
See microsoft/git#206 and microsoft/git#207 for the Git updates. Un-ignore a functional test now that Git is doing the right thing. Resolves #147
2 parents 307a500 + c3216f1 commit 9dc5ce8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.azure-pipelines/templates/windows-functional-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ steps:
3131
displayName: Publish Git trace2 log
3232
inputs:
3333
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
34-
artifactName: trace2-event-windows.txt
34+
artifactName: trace2-event-windows.txt
35+
condition: failed()

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.20191004.2-sc</GitPackageVersion>
6+
<GitPackageVersion>2.20191009.1-sc</GitPackageVersion>
77
</PropertyGroup>
88

99
<PropertyGroup Label="DefaultSettings">

Scalar.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public void DownloadingACommitWithoutTreesDoesntBreakNextClone()
103103
}
104104

105105
[TestCase]
106-
[Ignore("TODO #147: Renamed this test after git recreates the gvfs.sharedCache folder if it's missing")]
107106
public void MountReusesLocalCacheKeyWhenGitObjectsRootDeleted()
108107
{
109108
ScalarFunctionalTestEnlistment enlistment = this.CloneAndMountEnlistment();

0 commit comments

Comments
 (0)