From: Toon Claes Date: Wed, 25 Mar 2026 15:32:17 GMT Subject: Re: [PATCH v2] replay: support replaying down from root commit Message-ID: <87a4vv2ada.fsf@iotcl.com> In-Reply-To: Christian Couder writes: > On Tue, Mar 24, 2026 at 8:56 PM Junio C Hamano wrote: >> >> Toon Claes writes: >> >> > git-replay(1) doesn't allow replaying commits all the way down to the >> > root commit. Fix that. >> > >> > Signed-off-by: Toon Claes >> > --- >> > 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!". I'm fixing that in a separate series. > 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`. > + Definitely would help, not sure it needs to be part of this series. -- Cheers, Toon