CFE-3967: cfbs no longer tries to commit when there is no diff #187
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
mineralsfree
force-pushed
the
CFE-3967
branch
from
1484f27
to
5dd4a8d
Compare
|
Should get you closer to passing CI |
mineralsfree
force-pushed
the
CFE-3967
branch
2 times, most recently
from
e49afe4
to
5de3401
Compare
mineralsfree
force-pushed
the
CFE-3967
branch
from
5de3401
to
6b54be1
Compare
olehermanse
reviewed
Jan 26, 2024
cfbs/git.py
Outdated
Comment on lines
200
to
201
| except CalledProcessError as cpe: | ||
| return False |
There was a problem hiding this comment.
When does this happen? Deserves at least a comment.
There was a problem hiding this comment.
It might happen if, for example the command fired not in a git repository
I'm not sure what should be the expected behavior :)
Maybe it's better to raise Exception?
There was a problem hiding this comment.
Ah, I see.
In that case I'd probably do:
user_error("Failed to run 'git status -s -u' to check for changes.")
Also, please ensure that your change works for projects not using git committing ("git": false in cfbs.json).
olehermanse
reviewed
Jan 26, 2024
cfbs/git.py
Outdated
Comment on lines
190
to
195
| changes = list( | ||
| map( | ||
| lambda m: m.strip().split(" ")[1], | ||
| list(filter(None, result.stdout.decode("utf-8").split("\n"))), | ||
| ) | ||
| ) |
There was a problem hiding this comment.
@mineralsfree something like this should work, and might be considered more readable :)
Suggested change
| changes = list( | |
| map( | |
| lambda m: m.strip().split(" ")[1], | |
| list(filter(None, result.stdout.decode("utf-8").split("\n"))), | |
| ) | |
| ) | |
| lines = result.stdout.decode("utf-8").split("\n") | |
| changes = [line.strip().split(" ")[1] for line in lines if line] |
mineralsfree
force-pushed
the
CFE-3967
branch
from
6b54be1
to
3482972
Compare
Ticket: CFE-3967 Changelog: None Signed-off-by: Mikita Pilinka <mikita.pilinka@northern.tech>
mineralsfree
force-pushed
the
CFE-3967
branch
from
3482972
to
57fae2a
Compare
olehermanse
changed the title
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.
Ticket: CFE-3967
Changelog: None
Signed-off-by: Mikita Pilinka mikita.pilinka@northern.tech