Milestones/m185 #1727
Merged
Milestones/m185 #1727
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
[HOTFIX] Update Git to remove ODB string check
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>
The interface between `microsoft/git` and 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: 1. Take the full GitVersion parsing logic from `microsoft/scalar`, as it is more robust. 2. Remove the exact version match with a minimum version match. 3. Use a fixed constant version string instead of a build-time string. 4. Require that the `Revision` of the version string is an _exact_ match. We will use this to signal that a `microsoft/git` version introduces a breaking change that requires a VFS for Git upgrade. What is a `Revision` item? In a Git version string such as `v2.X.Y.vfs.Z.W`, the `Revision` is represented by `Z`. This allows us to modify the other version items arbitrarily, including taking version numbers `2.X.Y` from upstream and updating `.W` if we have any hotfixes to `microsoft/git`.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
derrickstolee
approved these changes
Mar 19, 2021
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeffhostetler
force-pushed
the
milestones/M185
branch
from
e256b97 to
080fa82
Compare
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
This includes the config option commitGraph.generationVersion.
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.
Major Changes
v2.30.0.vfs.0.0or greater, and users can upgrade Git independently from themicrosoft/gitreleases page independently of VFS for Git.Pull Requests