Merge pull request #1626: Update Git to v2.25.0

See microsoft/git#233.
microsoft · Jan 17, 2020 · 611423a · 611423a
2 parents 1aec263 + c5ffa8c
commit 611423a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup Label="Parameters">
     <GVFSVersion>0.2.173.2</GVFSVersion>
-    <GitPackageVersion>2.20191217.3</GitPackageVersion>
+    <GitPackageVersion>2.20200116.1</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/WindowsUpdatePlaceholderTests.cs b/GVFS/GVFS.FunctionalTests.Windows/Windows/Tests/WindowsUpdatePlaceholderTests.cs
@@ -58,6 +58,8 @@ public void LockToPreventDelete_SingleFile()
                     "HEAD detached at " + OldCommitId,
                     "Untracked files:",
                     TestParentFolderName + "/LockToPreventDelete/" + testFile1Name);
+
+                testFile1Path.ShouldBeAFile(this.fileSystem).WithContents(testFile1Contents);
             }
 
             this.GitCleanFile(TestParentFolderName + "/LockToPreventDelete/" + testFile1Name);