Remove initial_state
as it gets out of sync with what's in .git/config
#88
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.
Currently,
miss-islington
use ofcherry-picker
is aborting the cherry pick in case of conflicts. This doesn't work becauseself.initial_state
is not being updated after conflicts are discovered bycherry-picker
, and so the abort is raising a ValueError from the guard at the start ofabort_cherry_pick()
.Since
self.initial_state
is only used for those guards, let's just remove it and read from.git/config
every time.