Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: harden "stg rebase -i" against patches with milti-line subjects #474

Merged
merged 1 commit into from
Jul 20, 2024

Commits on Jul 16, 2024

  1. fix: harden "stg rebase -i" against patches with milti-line subjects

    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>
    dtor committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    ef794d3 View commit details
    Browse the repository at this point in the history