Enforce only a minimum Git version #1719
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/azp run |
|
No pipelines are associated with this pull request. |
derrickstolee
force-pushed
the
git-version-checker
branch
5 times, most recently
from
e808c51 to
0f83d6f
Compare
This parsing is more robust to many different Git versions. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
We will use the following rules for testing the Git version is compatible with the current version of VFS for Git: 1. The Platform must match ".vfs." 2. The version must be at least the fixed minimum revision. 3. The Revision must equal the current minimum revision. This allows us to upgrade Git without updating VFS for Git. Thus, we could reduce VFS for Git version upgrades when Git releases a security update. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
derrickstolee
force-pushed
the
git-version-checker
branch
from
0f83d6f to
cce6a5f
Compare
derrickstolee
changed the title
jeffhostetler
approved these changes
Feb 2, 2021
Merged
derrickstolee
added a commit
that referenced
this pull request
Mar 23, 2021
Major Changes ---------------- * Includes Git v2.31.0. * VFS for Git now only performs a minimum version check with the installed version of Git. This means that VFS for Git is compatible with Git versions `v2.30.0.vfs.0.0` or greater, and users can upgrade Git independently from [the `microsoft/git` releases page](https://github.com/microsoft/git/releases) independently of VFS for Git. Pull Requests -------------- * #1716: Update Git to remove ODB string check * #1719: Enforce only a minimum Git version * #1726: Config: commitGraph.generationVersion=1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The interface between
microsoft/gitand VFS for Git has been stable for a while. We don't anticipate changing it any time soon. Thus, we can drop the requirement of an exact Git version match.This PR changes the current logic in a few ways:
microsoft/scalar, as it is more robust.Revisionof the version string is an exact match. We will use this to signal that amicrosoft/gitversion introduces a breaking change that requires a VFS for Git upgrade.What is a
Revisionitem? In a Git version string such asv2.X.Y.vfs.Z.W, theRevisionis represented byZ. This allows us to modify the other version items arbitrarily, including taking version numbers2.X.Yfrom upstream and updating.Wif we have any hotfixes tomicrosoft/git.