From: Junio C Hamano <gitster@pobox.com>
To: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH v2 4/5] checkout: cleanup --conflict=<style> parsing
Date: Thu, 14 Mar 2024 10:24:01 -0700 [thread overview]
Message-ID: <xmqqmsr0via6.fsf@gitster.g> (raw)
In-Reply-To: <511e03d3db26b174fa6585310b9866a06ac2dff0.1710435907.git.gitgitgadget@gmail.com> (Phillip Wood via GitGitGadget's message of "Thu, 14 Mar 2024 17:05:06 +0000")
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> +static int parse_opt_conflict(const struct option *o, const char *arg, int unset)
> +{
> + struct checkout_opts *opts = o->value;
> +
> + if (unset) {
> + opts->conflict_style = -1;
> + return 0;
> + }
> + opts->conflict_style = parse_conflict_style_name(arg);
> + if (opts->conflict_style < 0)
> + return error(_("unknown conflict style '%s'"), arg);
> +
> + return 0;
> +}
> +
> static struct option *add_common_options(struct checkout_opts *opts,
> struct option *prevopts)
> {
> @@ -1628,8 +1649,9 @@ static struct option *add_common_options(struct checkout_opts *opts,
> PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
> OPT_BOOL(0, "progress", &opts->show_progress, N_("force progress reporting")),
> OPT_BOOL('m', "merge", &opts->merge, N_("perform a 3-way merge with the new branch")),
> - OPT_STRING(0, "conflict", &opts->conflict_style, N_("style"),
> - N_("conflict style (merge, diff3, or zdiff3)")),
> + OPT_CALLBACK(0, "conflict", opts, N_("style"),
> + N_("conflict style (merge, diff3, or zdiff3)"),
> + parse_opt_conflict),
> OPT_END()
> };
> struct option *newopts = parse_options_concat(prevopts, options);
Looking good.
next prev parent reply other threads:[~2024-03-14 17:24 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-08 14:14 [PATCH 0/4] checkout: cleanup --conflict= Phillip Wood via GitGitGadget
2024-03-08 14:14 ` [PATCH 1/4] xdiff-interface: refactor parsing of merge.conflictstyle Phillip Wood via GitGitGadget
2024-03-08 14:14 ` [PATCH 2/4] merge-ll: introduce LL_MERGE_OPTIONS_INIT Phillip Wood via GitGitGadget
2024-03-08 14:14 ` [PATCH 3/4] merge options: add a conflict style member Phillip Wood via GitGitGadget
2024-03-08 15:46 ` Junio C Hamano
2024-03-08 16:13 ` phillip.wood123
2024-03-08 16:48 ` Junio C Hamano
2024-03-09 4:33 ` Elijah Newren
2024-03-09 5:46 ` Junio C Hamano
2024-03-08 14:14 ` [PATCH 4/4] checkout: cleanup --conflict=<style> parsing Phillip Wood via GitGitGadget
2024-03-08 16:15 ` Junio C Hamano
2024-03-08 16:22 ` phillip.wood123
2024-03-08 21:40 ` Junio C Hamano
2024-03-11 14:36 ` phillip.wood123
2024-03-11 17:41 ` Junio C Hamano
2024-03-12 15:50 ` Phillip Wood
2024-03-08 15:44 ` [PATCH 0/4] checkout: cleanup --conflict= Junio C Hamano
2024-03-08 16:07 ` phillip.wood123
2024-03-14 17:05 ` [PATCH v2 0/5] " Phillip Wood via GitGitGadget
2024-03-14 17:05 ` [PATCH v2 1/5] xdiff-interface: refactor parsing of merge.conflictstyle Phillip Wood via GitGitGadget
2024-03-14 17:19 ` Junio C Hamano
2024-03-14 17:05 ` [PATCH v2 2/5] merge-ll: introduce LL_MERGE_OPTIONS_INIT Phillip Wood via GitGitGadget
2024-03-14 17:05 ` [PATCH v2 3/5] merge options: add a conflict style member Phillip Wood via GitGitGadget
2024-03-14 17:21 ` Junio C Hamano
2024-03-14 17:05 ` [PATCH v2 4/5] checkout: cleanup --conflict=<style> parsing Phillip Wood via GitGitGadget
2024-03-14 17:24 ` Junio C Hamano [this message]
2024-03-14 17:05 ` [PATCH v2 5/5] checkout: fix interaction between --conflict and --merge Phillip Wood via GitGitGadget
2024-03-14 17:32 ` Junio C Hamano
2024-03-14 17:07 ` [PATCH v2 0/5] checkout: cleanup --conflict= Phillip Wood
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmsr0via6.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=newren@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).