diff --git a/GVFS/GVFS.Build/GVFS.props b/GVFS/GVFS.Build/GVFS.props
index 34ff89e778..595ee50a6f 100644
--- a/GVFS/GVFS.Build/GVFS.props
+++ b/GVFS/GVFS.Build/GVFS.props
@@ -3,7 +3,7 @@
0.2.173.2
- 2.20181129.1
+ 2.20181210.10-pr
diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
index fbfb81e368..a83eeb1793 100644
--- 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
index 8335c7f4d7..d75efd1f8e 100644
--- 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 },
};