Re: [PATCH v3 0/3] replay: make atomic ref updates the default

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 14, 2025, 21:13 UTC
Message-ID: <xmqqtt01w5jh.fsf@gitster.g>
In-Reply-To: <20251013182530.33041-1-siddharthasthana31@gmail.com>

When merged to 'seen', this breaks t0450; from the way the test breaks, I suspect that it has the same breakage if the topic gets tested standalone.

    $ make
    $ cd t
    $ sh t0450-txt-doc-vs-help.sh -i -v
    ...
    --- adoc        2025-10-14 21:02:48.680184914 +0000
    +++ help        2025-10-14 21:02:48.688184867 +0000
    @@ -1,2 +1 @@
    -(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>)
    -           [--update-refs[=<mode>]] <revision-range>...
    +(EXPERIMENTAL!) git replay ([--contained] --onto <newbase> | --advance <branch>) [--update-refs[=<mode>]] <revision-range>...
    not ok ...

In short, "git replay -h" and the initial part of "git replay --help" must match.

Minimally you'd need to squash in something like the following patch. Alternatively, you could match the documentation page (which is shown by "git replay --help") to match what "git replay -h" gives.

 builtin/replay.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git i/builtin/replay.c w/builtin/replay.c
index 3c618bf100..d0f0492790 100644
--- i/builtin/replay.c
+++ w/builtin/replay.c
@@ -330,7 +330,7 @@ int cmd_replay(int argc,
 
 	const char *const replay_usage[] = {
 		N_("(EXPERIMENTAL!) git replay "
-		   "([--contained] --onto <newbase> | --advance <branch>) "
+		   "([--contained] --onto <newbase> | --advance <branch>)\n"
 		   "[--update-refs[=<mode>]] <revision-range>..."),
 		NULL
 	};