pdk update and convert fixes #433
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
hunner
reviewed
Feb 22, 2018
lib/pdk/module/update.rb
Outdated
| data = GIT_DESCRIBE_PATTERN.match(current_template_version) | ||
|
|
||
| return version if data.nil? | ||
| return version unless version.include?('/') | ||
|
|
||
| branch = version.partition('/').last if version.include?('/') |
There was a problem hiding this comment.
Do we care about branches with /'s in the name?
There was a problem hiding this comment.
The git ref we pull from repos shows up as 'origin/master' or 'refs/heads/master'.
When doing starting an update, pdk needs to be able to handle refs that are tags or branch heads and be able to compare sha when they are branches.
|
Bryan and I talked about this more, we think long-term we can stop comparing the refs altogether and just check to see if there are pending changes and report the version of the template that was used, but this works for now. |
scotje
approved these changes
Feb 22, 2018
… and default ref is a tag
scotje
approved these changes
Feb 22, 2018
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.
Fixes two problems: