From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: jrnieder@gmail.com, git@vger.kernel.org, Jens.Lehmann@web.de
Subject: Re: [PATCHv9 1/6] submodule-config: keep update strategy around
Date: Tue, 09 Feb 2016 14:32:47 -0800 [thread overview]
Message-ID: <xmqqfux11pm8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1455051274-15256-2-git-send-email-sbeller@google.com> (Stefan Beller's message of "Tue, 9 Feb 2016 12:54:29 -0800")
Stefan Beller <sbeller@google.com> writes:
> + else {
> + submodule->update_command = NULL;
> + if (!strcmp(value, "none"))
> + submodule->update = SM_UPDATE_NONE;
> + else if (!strcmp(value, "checkout"))
> + submodule->update = SM_UPDATE_CHECKOUT;
> + else if (!strcmp(value, "rebase"))
> + submodule->update = SM_UPDATE_REBASE;
> + else if (!strcmp(value, "merge"))
> + submodule->update = SM_UPDATE_MERGE;
> + else if (!skip_prefix(value, "!", &submodule->update_command))
> + die(_("invalid value for %s"), var);
> + }
I think this "string to enum" parser can become a separate helper
function in this patch, so that later patch can use it to parse the
"--update" option in the update_clone() function.
That would solve the slight inconsistency we have seen
+ if ((pp->update && !strcmp(pp->update, "none")) ||
+ (!pp->update && sub->update == SM_UPDATE_NONE)) {
in that patch.
next prev parent reply other threads:[~2016-02-09 22:32 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 20:54 [PATCHv9 0/6] Expose submodule parallelism to the user Stefan Beller
2016-02-09 20:54 ` [PATCHv9 1/6] submodule-config: keep update strategy around Stefan Beller
2016-02-09 21:08 ` Junio C Hamano
2016-02-09 22:19 ` Stefan Beller
2016-02-09 22:29 ` Junio C Hamano
2016-02-09 21:49 ` Jonathan Nieder
2016-02-09 22:32 ` Junio C Hamano [this message]
2016-02-11 20:00 ` Junio C Hamano
2016-02-09 20:54 ` [PATCHv9 2/6] submodule-config: drop check against NULL Stefan Beller
2016-02-09 21:50 ` Jonathan Nieder
2016-02-09 20:54 ` [PATCHv9 3/6] fetching submodules: respect `submodule.fetchJobs` config option Stefan Beller
2016-02-09 21:12 ` Junio C Hamano
2016-02-09 22:34 ` Jonathan Nieder
2016-02-10 0:11 ` Stefan Beller
2016-02-10 1:12 ` Junio C Hamano
2016-02-10 2:04 ` Junio C Hamano
2016-02-09 20:54 ` [PATCHv9 4/6] git submodule update: have a dedicated helper for cloning Stefan Beller
2016-02-09 21:24 ` Junio C Hamano
2016-02-10 0:37 ` Jonathan Nieder
2016-02-10 2:26 ` Jacob Keller
2016-02-10 17:49 ` Stefan Beller
2016-02-11 7:46 ` Jacob Keller
2016-02-09 20:54 ` [PATCHv9 5/6] submodule update: expose parallelism to the user Stefan Beller
2016-02-09 20:54 ` [PATCHv9 6/6] clone: allow an explicit argument for parallel submodule clones Stefan Beller
2016-02-09 21:39 ` [PATCHv9 0/6] Expose submodule parallelism to the user Junio C Hamano
2016-02-09 21:46 ` Stefan Beller
2016-02-09 22:03 ` Junio C Hamano
2016-02-11 20:23 ` Junio C Hamano
2016-02-11 20:28 ` Junio C Hamano
2016-02-11 20:33 ` Stefan Beller
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=xmqqfux11pm8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.