Merge pull request #1751: Update Git to v2.33.0

See microsoft/git#405.
microsoft · Aug 17, 2021 · 4a4e0aa · 4a4e0aa
2 parents ab619f7 + 30ba580
commit 4a4e0aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs
@@ -66,6 +66,9 @@ public void Initialize()
             GitProcess.Invoke(this.RootPath, "branch --set-upstream " + this.Commitish + " origin/" + this.Commitish);
             GitProcess.Invoke(this.RootPath, "checkout " + this.Commitish);
             GitProcess.Invoke(this.RootPath, "branch --unset-upstream");
+
+            // Enable the ORT merge strategy
+            GitProcess.Invoke(this.RootPath, "config pull.twohead ort");
         }
 
         public void Fetch(string commitish)

diff --git a/Version.props b/Version.props
@@ -18,7 +18,7 @@
        including taking version numbers 2.X.Y from upstream and updating .W if we have any
        hotfixes to microsoft/git.
     -->
-    <GitPackageVersion>2.20210701.3</GitPackageVersion>
+    <GitPackageVersion>2.20210817.4</GitPackageVersion>
     <MinimumGitVersion>v2.31.0.vfs.0.1</MinimumGitVersion>
   </PropertyGroup>