Re: Instead of "Revert "Revert "original"", give "Replay "original""

Josh Soref· May 9, 2023, 05:18 UTC · lore

https://github.com/git/git/commit/42e073b5ff5f9e8bc2356151dbab0c95321d2454

The commit message says: --- Merge branch 'ob/revert-of-revert' into seen

Instead of "Revert "Revert "original"", give "Replay "original"" as the title for a revert of a revert.

* ob/revert-of-revert:
  sequencer: beautify subject of reverts of reverts

---

However, the code uses `Reapply`, not `Replay`.

Junio C Hamano· May 9, 2023, 16:36 UTC · re: Josh Soref · lore

Josh Soref <jsoref@gmail.com> writes:

Show 11 quoted lines

> https://github.com/git/git/commit/42e073b5ff5f9e8bc2356151dbab0c95321d2454
>
> The commit message says:
> ---
> Merge branch 'ob/revert-of-revert' into seen
>
> Instead of "Revert "Revert "original"", give "Replay "original""
> as the title for a revert of a revert.
>
> * ob/revert-of-revert:
>   sequencer: beautify subject of reverts of reverts

Thanks for spotting.

This comes from my working draft of the "What's cooking" report and every time I merge the topic to any integration branch it is extracted from there and used to annotate the merge commit. I'll update it there so that it will say "Reapply" when the final reroll comes and it is merged to 'next' and down to 'master'.