Re: [PATCH v2] replay: support replaying down from root commit
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Mar 25, 2026, 10:00 UTC
- Message-ID
- <CAP8UFD1zJXnsm7POK32GqEu4xSC+VO5mfzUpM-jn+Nr1qvzEFQ@mail.gmail.com>
- In-Reply-To
- <xmqqtsu5xaw0.fsf@gitster.g>
On Tue, Mar 24, 2026 at 8:56 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 14 quoted lines
> > Toon Claes <toon@iotcl.com> writes: > > > git-replay(1) doesn't allow replaying commits all the way down to the > > root commit. Fix that. > > > > Signed-off-by: Toon Claes <toon@iotcl.com> > > --- > > These changes might conflict Siddharth's series[1] to add '--revert' to > > git-replay(1), although resolving that should be trivial. > > True. This round looks great to me. Will queue. > > Shall we mark the topic for 'next' now?
The patch looks good to me, but I wonder if the docs should be updated somehow, especially to try to avoid confusion in case users don't properly specify a range.
For example, before this, `git replay --onto main topic` would fail, but emit "fatal: replaying down from root commit is not supported yet!". This would likely help users understand that they might need to properly specify a range like "main..topic" instead of 'topic".
Now it would likely fail without any error message.
Maybe something like the following could help:
--- a/Documentation/git-replay.adoc +++ b/Documentation/git-replay.adoc @@ -23,6 +23,10 @@ instead get update commands that can be piped to `git update-ref --stdin` THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE. +Note that `git replay --onto main topic` replays the topic branch starting +from the root commit, not from main. What you might want instead is +`git replay --onto main main..topic`. + OPTIONS ------- ? And yeah currently `git replay` is a plumbing command that most regular users shouldn't likely use, but I think Elijah's goal was to eventually make it user friendly enough for advanced users with stacked branches.