git-push: fix bad combination of --change and --branch
#3348
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
It's unclear whether --change should precede or not, but it's wrong to try to push the same branch twice.
…updates It could be moved before set_local_branch_target() to not update the local branch, but it seemed weird that --change is silently ignored. This inconsistency will be addressed later.
This is the common pattern among other classify() loops. I also changed the set to hold &str as it doesn't need owned strings.
… state This fixes --change/--branch conflicts by making --change precede --branch. I don't think this is the most obvious behavior, but it's the easiest workaround.
bnjmnt4n
approved these changes
Mar 24, 2024
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.
Checklist
If applicable:
CHANGELOG.md