From: Patrick Steinhardt <ps@pks.im>
To: Toon Claes <toon@iotcl.com>
Cc: git@vger.kernel.org,
"Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail.com>,
"Michal Suchánek" <msuchanek@suse.de>,
"Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>
Subject: Re: [PATCH v5 6/7] parse-options: introduce die_for_incompatible_opt2()
Date: Wed, 5 Feb 2025 09:03:32 +0100 [thread overview]
Message-ID: <Z6MbVAwn15_h8Sxy@pks.im> (raw)
In-Reply-To: <20250204-toon-clone-refs-v5-6-37e34af283c8@iotcl.com>
On Tue, Feb 04, 2025 at 10:34:05PM +0100, Toon Claes wrote:
> diff --git a/builtin/replay.c b/builtin/replay.c
> index 1afc6d1ee0cb738fa7fa3f2b5c8ce0dd7802e7da..03d93afd77290ab556565f05bd424956b66ff01c 100644
> --- a/builtin/replay.c
> +++ b/builtin/replay.c
> @@ -164,7 +164,8 @@ static void determine_replay_mode(struct rev_cmdline_info *cmd_info,
> if (!rinfo.positive_refexprs)
> die(_("need some commits to replay"));
> if (onto_name && *advance_name)
> - die(_("--onto and --advance are incompatible"));
> + die_for_incompatible_opt2(!!onto_name, "--onto",
> + !!*advance_name, "--advance");
The condition isn't needed anymore, is it? As far as I know,
`die_for_incompatible_opt*()` handle the condition internally.
Patrick
next prev parent reply other threads:[~2025-02-05 8:03 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-29 12:00 [PATCH v2] builtin/clone: teach git-clone(1) the --revision= option Toon Claes
2024-12-02 14:08 ` Patrick Steinhardt
2024-12-02 21:17 ` Jeff King
2024-12-03 15:34 ` Michal Suchánek
2024-12-19 11:23 ` Toon Claes
2024-12-19 11:58 ` [PATCH v3] " Toon Claes
2024-12-19 18:30 ` Junio C Hamano
2025-01-31 15:30 ` [PATCH v4 0/6] Enable doing a shallow clone of a specific git revision Toon Claes
2025-01-31 15:30 ` [PATCH v4 1/6] clone: cut down on global variables in clone.c Toon Claes
2025-01-31 15:30 ` [PATCH v4 2/6] clone: make it possible to specify --tags Toon Claes
2025-02-01 16:47 ` Jean-Noël AVILA
2025-01-31 15:30 ` [PATCH v4 3/6] clone: refactor wanted_peer_refs() Toon Claes
2025-02-03 7:51 ` Patrick Steinhardt
2025-01-31 15:30 ` [PATCH v4 4/6] clone: add tags refspec earlier to fetch refspec Toon Claes
2025-02-03 7:51 ` Patrick Steinhardt
2025-01-31 15:30 ` [PATCH v4 5/6] clone: introduce struct clone_opts in builtin/clone.c Toon Claes
2025-02-03 7:51 ` Patrick Steinhardt
2025-01-31 15:30 ` [PATCH v4 6/6] builtin/clone: teach git-clone(1) the --revision= option Toon Claes
2025-01-31 21:05 ` Junio C Hamano
2025-02-01 16:50 ` Jean-Noël AVILA
2025-02-03 7:51 ` Patrick Steinhardt
2025-02-04 21:33 ` [PATCH v5 0/7] Enable doing a shallow clone of a specific git revision Toon Claes
2025-02-04 21:34 ` [PATCH v5 1/7] clone: cut down on global variables in clone.c Toon Claes
2025-02-04 21:34 ` [PATCH v5 2/7] clone: make it possible to specify --tags Toon Claes
2025-02-05 8:03 ` Patrick Steinhardt
2025-02-05 16:29 ` Toon Claes
2025-02-05 21:15 ` Jean-Noël AVILA
2025-02-04 21:34 ` [PATCH v5 3/7] clone: refactor wanted_peer_refs() Toon Claes
2025-02-04 21:34 ` [PATCH v5 4/7] clone: add tags refspec earlier to fetch refspec Toon Claes
2025-02-05 8:03 ` Patrick Steinhardt
2025-02-04 21:34 ` [PATCH v5 5/7] clone: introduce struct clone_opts in builtin/clone.c Toon Claes
2025-02-04 21:34 ` [PATCH v5 6/7] parse-options: introduce die_for_incompatible_opt2() Toon Claes
2025-02-05 8:03 ` Patrick Steinhardt [this message]
2025-02-04 21:34 ` [PATCH v5 7/7] builtin/clone: teach git-clone(1) the --revision= option Toon Claes
2025-02-05 8:03 ` Patrick Steinhardt
2025-02-05 16:43 ` Toon Claes
2025-02-05 8:03 ` [PATCH v5 0/7] Enable doing a shallow clone of a specific git revision Patrick Steinhardt
2025-02-05 14:09 ` Junio C Hamano
2025-02-05 16:47 ` [PATCH v6 " Toon Claes
2025-02-05 16:47 ` [PATCH v6 1/7] clone: cut down on global variables in clone.c Toon Claes
2025-02-05 16:47 ` [PATCH v6 2/7] clone: make it possible to specify --tags Toon Claes
2025-02-05 16:47 ` [PATCH v6 3/7] clone: refactor wanted_peer_refs() Toon Claes
2025-02-05 16:47 ` [PATCH v6 4/7] clone: add tags refspec earlier to fetch refspec Toon Claes
2025-02-05 16:47 ` [PATCH v6 5/7] clone: introduce struct clone_opts in builtin/clone.c Toon Claes
2025-02-05 16:47 ` [PATCH v6 6/7] parse-options: introduce die_for_incompatible_opt2() Toon Claes
2025-02-05 16:47 ` [PATCH v6 7/7] builtin/clone: teach git-clone(1) the --revision= option Toon Claes
2025-02-05 17:24 ` Junio C Hamano
2025-02-06 6:33 ` [PATCH v7 0/7] Enable doing a shallow clone of a specific git revision Toon Claes
2025-02-06 6:33 ` [PATCH v7 1/7] clone: cut down on global variables in clone.c Toon Claes
2025-02-06 6:33 ` [PATCH v7 2/7] clone: make it possible to specify --tags Toon Claes
2025-02-06 6:33 ` [PATCH v7 3/7] clone: refactor wanted_peer_refs() Toon Claes
2025-02-06 6:33 ` [PATCH v7 4/7] clone: add tags refspec earlier to fetch refspec Toon Claes
2025-02-06 6:33 ` [PATCH v7 5/7] clone: introduce struct clone_opts in builtin/clone.c Toon Claes
2025-02-06 6:33 ` [PATCH v7 6/7] parse-options: introduce die_for_incompatible_opt2() Toon Claes
2025-02-06 6:33 ` [PATCH v7 7/7] builtin/clone: teach git-clone(1) the --revision= option Toon Claes
2025-02-06 8:13 ` Patrick Steinhardt
2025-02-06 20:26 ` 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=Z6MbVAwn15_h8Sxy@pks.im \
--to=ps@pks.im \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kristofferhaugsbakk@fastmail.com \
--cc=msuchanek@suse.de \
--cc=peff@peff.net \
--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).