Allow rebase custom patch options for subcommits-started patch if from current branch#5801
Open
brandondong wants to merge 1 commit into
Open
Allow rebase custom patch options for subcommits-started patch if from current branch#5801brandondong wants to merge 1 commit into
brandondong wants to merge 1 commit into
Conversation
…m current branch Semantically, starting a custom patch from the commits panel vs the subcommits panel of the currently checked-out branch should be identical. However, the rebase-related options are currently hidden for the latter case. This code change matches the two in behavior.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
PR Description
I was really confused as to why sometimes after creating a custom patch, the custom patch options menu would be missing some options like "Remove patch from original commit" or "Move patch out into index" even though they should be possible.
After playing around some more and looking at the code, it turns out this was due to my inconsistent muscle memory sometimes starting the custom patch from the branches -> subcommits view of the currently checked-out branch vs directly from the commits panel.
I don't think this discrepancy should exist. The two views are essentially semantically identical when drilling down on the current branch and all the rebase-related operations work in one versus the other.
This code change matches the two in behavior for showing of options.
Please check if the PR fulfills these requirements
go generate ./...)