From: Phillip Wood Date: Mon, 16 Mar 2026 16:57:32 GMT Subject: Re: [PATCH v4 1/2] sequencer: extract revert message formatting into shared function Message-ID: <6033b9ea-f219-43cc-9ce0-901594364ccd@gmail.com> In-Reply-To: <20260313054035.26605-2-siddharthasthana31@gmail.com> On 13/03/2026 05:40, Siddharth Asthana wrote: > The logic for formatting revert commit messages (handling "Revert" and > "Reapply" cases, appending "This reverts commit .", and handling > merge-parent references) currently lives inline in do_pick_commit(). > The upcoming replay --revert mode needs to reuse this logic. > > Extract all of this into a new sequencer_format_revert_message() > function. The function takes a repository, the subject line, commit, > parent, a use_commit_reference flag, and the output strbuf. It handles > both regular reverts ("Revert """) and revert-of-revert cases > ("Reapply """), and uses refer_to_commit() internally to > format the commit reference. > > Update refer_to_commit() to take a struct repository parameter instead > of relying on the_repository, and a bool instead of reading from > replay_opts directly. This makes it usable from the new shared function > without pulling in sequencer-specific state. This looks good. > +/* > + * Formats a complete revert commit message following standard Git conventions. > + * Handles regular reverts ("Revert \"\""), revert of revert cases Not worth a re-roll on its own, but for future reference in comments you can use single quotes to avoid nesting double quotes i.e. ('Revert ""'). Thanks Phillip > + * ("Reapply \"\""), and the --reference style. Appends "This reverts > + * commit ." using either the abbreviated or full commit reference > + * depending on use_commit_reference. Also handles merge-parent references. > + */ > +void sequencer_format_revert_message(struct repository *r, > + const char *subject, > + const struct commit *commit, > + const struct commit *parent, > + bool use_commit_reference, > + struct strbuf *message); > + > #endif /* SEQUENCER_H */