fix: harden "stg rebase -i" against patches with milti-line subjects #474
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
I have a stgit stack that is very old (I started it more than 10 years ago), so it has all kinds of WIP patches that I started and then did not quite finish. In several of them I have malformed patch subjects, such as multi-line titles: $ git show -1 --pretty=%B subsystem: fix driver certain change This breaks "stg rebase -i" because it expects to have one line per patch in the rebase template, but in this case subject spills over to the next line which rebase mistakes for an instruction: error: unknown instruction action `certain` Fix this my replacing new lines and line feeds in the subject with spaces. Signed-off-by: Dmitry Torokhov <dtor@google.com>
|
Thank you for this PR, @dtor. Much appreciated. |
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.
I have a stgit stack that is very old (I started it more than 10 years ago), so it has all kinds of WIP patches that I started and then did not quite finish. In several of them I have malformed patch subjects, such as multi-line titles:
$ git show -1 --pretty=%B
subsystem: fix driver
certain change
This breaks "stg rebase -i" because it expects to have one line per patch in the rebase template, but in this case subject spills over to the next line which rebase mistakes for an instruction:
error: unknown instruction action
certainFix this my replacing new lines and line feeds in the subject with spaces.