[vcpkg] Restore embedded git hash behind an option. #15472
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
BillyONeal
added
category:vcpkg-feature
BillyONeal
added a commit
to microsoft/vcpkg-tool
that referenced
this pull request
Jan 6, 2021
ras0219
reviewed
Jan 6, 2021
| @@ -24,17 +24,15 @@ namespace vcpkg::Commands::Version | |||
| ; | |||
| } | |||
|
|
|||
| const std::string& version() | |||
| const char* version() | |||
ras0219
approved these changes
Jan 6, 2021
| @@ -55,7 +53,7 @@ namespace vcpkg::Commands::Version | |||
| const auto num1 = scan3(version_contents->c_str(), "\"%d.%d.%d\"", &maj1, &min1, &rev1); | |||
There was a problem hiding this comment.
Noting here that VERSION.txt will need to be copied into the parent repo so that we don't need the submodule at runtime.
There was a problem hiding this comment.
I don't think we need to touch anything about this. When the tool is deployed in binary form there is no version.txt which means this check is disabled. (The if on line 50 protects it)
But in registries world we can't ever make the kinds of changes this was trying to protect against anyway so I'm not sure it matters....
There was a problem hiding this comment.
I'm going to merge this as-is for now and introduce vcpkg_minimum_required as another PR.
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.
No description provided.