Update Git to [PR BUILD] vfs-2.20.0

microsoft · Dec 11, 2018 · 9cc6534 · 9cc6534
1 parent 2fc0a49
commit 9cc6534
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
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.20181129.1</GitPackageVersion>
+    <GitPackageVersion>2.20181210.10-pr</GitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="DefaultSettings">

diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
@@ -48,12 +48,15 @@ public void Initialize()
         {
             Directory.CreateDirectory(this.RootPath);
             GitProcess.Invoke(this.RootPath, "init");
+            GitProcess.Invoke(this.RootPath, "config checkout.optimizenewbranch false");
             GitProcess.Invoke(this.RootPath, "config core.autocrlf false");
+            GitProcess.Invoke(this.RootPath, "config index.threads true");
             GitProcess.Invoke(this.RootPath, "config merge.stat false");
             GitProcess.Invoke(this.RootPath, "config merge.renames false");
             GitProcess.Invoke(this.RootPath, "config advice.statusUoption false");
             GitProcess.Invoke(this.RootPath, "config core.abbrev 40");
             GitProcess.Invoke(this.RootPath, "config status.aheadbehind false");
+//            GitProcess.Invoke(this.RootPath, "config reset.quiet true");
             GitProcess.Invoke(this.RootPath, "config user.name \"Functional Test User\"");
             GitProcess.Invoke(this.RootPath, "config user.email \"functional@test.com\"");
             GitProcess.Invoke(this.RootPath, "remote add origin " + CachePath);

diff --git a/GVFS/GVFS/CommandLine/GVFSVerb.cs b/GVFS/GVFS/CommandLine/GVFSVerb.cs
@@ -130,7 +130,7 @@ public static bool TrySetRequiredGitConfigSettings(Enlistment enlistment)
                 { "merge.renames", "false" },
                 { "pack.useBitmaps", "false" },
                 { "receive.autogc", "false" },
-                { "reset.quiet", "true" },
+                // { "reset.quiet", "true" }, // Testing removal for 2.20
                 { "status.deserializePath", gitStatusCachePath },
             };