git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Siddharth Asthana <siddharthasthana31@gmail.com>
Cc: git@vger.kernel.org,  christian.couder@gmail.com,
	phillip.wood123@gmail.com,  phillip.wood@dunelm.org.uk,
	newren@gmail.com,  ps@pks.im,  karthik.188@gmail.com,
	code@khaugsbakk.name,  rybak.a.v@gmail.com,  jltobler@gmail.com,
	toon@iotcl.com,  johncai86@gmail.com,
	 johannes.schindelin@gmx.de
Subject: Re: [PATCH v3 0/3] replay: make atomic ref updates the default
Date: Tue, 14 Oct 2025 14:13:22 -0700	[thread overview]
Message-ID: <xmqqtt01w5jh.fsf@gitster.g> (raw)
In-Reply-To: <20251013182530.33041-1-siddharthasthana31@gmail.com> (Siddharth Asthana's message of "Mon, 13 Oct 2025 23:55:27 +0530")

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
 	};

  parent reply	other threads:[~2025-10-14 21:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-13 18:25 [PATCH v3 0/3] replay: make atomic ref updates the default Siddharth Asthana
2025-10-13 18:25 ` [PATCH v3 1/3] replay: use die_for_incompatible_opt2() for option validation Siddharth Asthana
2025-10-13 19:54   ` Junio C Hamano
2025-10-13 18:25 ` [PATCH v3 2/3] replay: make atomic ref updates the default behavior Siddharth Asthana
2025-10-13 18:25 ` [PATCH v3 3/3] replay: add replay.defaultAction config option Siddharth Asthana
2025-10-13 18:55 ` [PATCH v3 0/3] replay: make atomic ref updates the default Siddharth Asthana
2025-10-14 21:13 ` Junio C Hamano [this message]
2025-10-15  5:05   ` Siddharth Asthana
  -- strict thread matches above, loose matches on Subject: below --
2025-09-26 23:08 [PATCH v2 0/1] replay: make atomic ref updates the default behavior Siddharth Asthana
2025-10-13 18:33 ` [PATCH v3 0/3] replay: make atomic ref updates the default Siddharth Asthana
2025-10-13 19:39   ` Junio C Hamano
2025-10-15  4:57     ` Siddharth Asthana
2025-10-15 10:33       ` Christian Couder
2025-10-15 14:45       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtt01w5jh.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=christian.couder@gmail.com \
    --cc=code@khaugsbakk.name \
    --cc=git@vger.kernel.org \
    --cc=jltobler@gmail.com \
    --cc=johannes.schindelin@gmx.de \
    --cc=johncai86@gmail.com \
    --cc=karthik.188@gmail.com \
    --cc=newren@gmail.com \
    --cc=phillip.wood123@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=ps@pks.im \
    --cc=rybak.a.v@gmail.com \
    --cc=siddharthasthana31@gmail.com \
    --cc=toon@iotcl.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).