CFE-4081: Fixed commiting of changes made by set-input #144
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
Should fail until I fix the bug. Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>
Signed-off-by: Ole Herman Schumacher Elgesem <ole.elgesem@northern.tech>
larsewi
changed the title
vpodzime
reviewed
Nov 22, 2022
| git diff --exit-code --staged | ||
|
|
||
| # Error if there are uncommited changes (to tracked files): | ||
| git diff --exit-code |
There was a problem hiding this comment.
Looks like these checks should be in a nicely-named function in some shared bash source.
vpodzime
reviewed
Nov 22, 2022
| old_data = read_json(path) | ||
| if old_data == data: | ||
| log.debug("Input data for '%s' unchanged, nothing to write / commit" % name) | ||
| return 0 |
There was a problem hiding this comment.
This should, ideally, be done before the more expensive checks/comparison above.
There was a problem hiding this comment.
I was thinking it makes sense to always do the expensive checks (validation), even if the (potentially bad) data is already there.
vpodzime
reviewed
Nov 22, 2022
| if config.get("git", False): | ||
| git_commit( | ||
| "Set the input for module '%s'" % name, | ||
| edit_commit_msg=False, |
There was a problem hiding this comment.
No interactivity here and prompting the user if they want to modify the commit message?
There was a problem hiding this comment.
Right, I am submitting some changes which should explain / clear this up. (In a follow-up).
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.
More work remains to fix committing in
cfbs add.