Fail git.latest states with uncommitted changes when force_reset=False #34869
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
Also, discard these changes when running the state if force_reset=True.
|
Nice! |
dschaller
pushed a commit
to lyft/salt
that referenced
this pull request
Sep 3, 2016
saltstack#34869) * Add git.diff function * Fail git.latest states with uncommitted changes when force_reset=False Also, discard these changes when running the state if force_reset=True. * Add integration test for case where there are uncommitted changes
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.
Also, discard these changes when running the state if force_reset=True.
Resolves #34725.