From e56ac4676f4dcdfd6f69972b79dd501307a8d167 Mon Sep 17 00:00:00 2001 From: Matt Cooper Date: Tue, 3 Aug 2021 10:57:41 -0400 Subject: [PATCH 1/3] Update Readme.md --- Readme.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Readme.md b/Readme.md index 3695e5b9ce..3dc9dbfdd0 100644 --- a/Readme.md +++ b/Readme.md @@ -15,12 +15,10 @@ ensure that Git operations such as `status`, `checkout`, etc., can be as quick as possible because they will only consider the files that the user has accessed, not all files in the repository. -[See our documentation](docs/index.md) for instructions to get started. - -## New name - -This project was formerly known as GVFS (Git Virtual File System). It is undergoing a rename to VFS for Git. While the rename is in progress, the code, protocol, -built executables, and releases may still refer to the old GVFS name. See https://github.com/Microsoft/VFSForGit/projects/4 for the latest status of the rename effort. +Note: for new deployments, we strongly recommend you consider +[Scalar](https://github.com/microsoft/scalar) instead of VFS for Git. By +combining the lessons from operating VFS for Git at scale with new developments +in Git, Scalar offers a clearer path forward for all large monorepos. ## Installing VFS for Git @@ -59,7 +57,7 @@ The installer can now be found at `C:\Repos\VFSForGit\BuildOutput\GVFS.Installer ## Trying out VFS for Git -* VFS for Git will work with any Git service that supports the +* VFS for Git requires a Git service that supports the [GVFS protocol](Protocol.md). For example, you can create a repo in [Azure DevOps](https://azure.microsoft.com/services/devops/), and push some contents to it. There are two constraints: @@ -71,6 +69,10 @@ The installer can now be found at `C:\Repos\VFSForGit\BuildOutput\GVFS.Installer * Run Git commands as you normally would * `gvfs unmount` when done +## Note on naming + +This project was formerly known as GVFS (Git Virtual File System). You may occasionally +see collateral, including code and protocol names, which refer to the previous name. # Licenses From 6a73986579811dcb01723c1f691f7df82ee95d2d Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 3 Aug 2021 17:17:30 -0400 Subject: [PATCH 2/3] Update Git to v2.33.0 --- Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version.props b/Version.props index 8dc2eb7738..09487168e3 100644 --- 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. --> - 2.20210701.3 + 2.20210817.4 v2.31.0.vfs.0.1 From 30ba580860e10fadf80afb6266095efc7ec3388c Mon Sep 17 00:00:00 2001 From: Derrick Stolee Date: Tue, 17 Aug 2021 10:07:07 -0400 Subject: [PATCH 3/3] Enable the ORT strategy in the control repo --- GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs b/GVFS/GVFS.FunctionalTests/Tools/ControlGitRepo.cs index d2f792cea2..e8c40099d4 100644 --- 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)