From: Jacob Keller <jacob.keller@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: Git mailing list <git@vger.kernel.org>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Brandon Williams <bmwill@google.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 06/15] update submodules: add submodule config parsing
Date: Fri, 17 Feb 2017 10:24:51 -0800 [thread overview]
Message-ID: <CA+P7+xozip8TuvyUe9vAPYLAg=QFieExhOyR7a0pgGFhiuO3jw@mail.gmail.com> (raw)
In-Reply-To: <20170216003811.18273-7-sbeller@google.com>
On Wed, Feb 15, 2017 at 4:38 PM, Stefan Beller <sbeller@google.com> wrote:
> Similar to b33a15b08 (push: add recurseSubmodules config option,
> 2015-11-17) and 027771fcb1 (submodule: allow erroneous values for the
> fetchRecurseSubmodules option, 2015-08-17), we add submodule-config code
> that is later used to parse whether we are interested in updating
> submodules.
>
> We need the `die_on_error` parameter to be able to call this parsing
> function for the config file as well, which if incorrect lets Git die.
>
> As we're just touching the header file, also mark all functions extern.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> submodule-config.c | 22 ++++++++++++++++++++++
> submodule-config.h | 17 +++++++++--------
> 2 files changed, 31 insertions(+), 8 deletions(-)
>
> diff --git a/submodule-config.c b/submodule-config.c
> index 93453909cf..93f01c4378 100644
> --- a/submodule-config.c
> +++ b/submodule-config.c
> @@ -234,6 +234,28 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
> return parse_fetch_recurse(opt, arg, 1);
> }
>
> +static int parse_update_recurse(const char *opt, const char *arg,
> + int die_on_error)
> +{
> + switch (git_config_maybe_bool(opt, arg)) {
> + case 1:
> + return RECURSE_SUBMODULES_ON;
> + case 0:
> + return RECURSE_SUBMODULES_OFF;
> + default:
> + if (!strcmp(arg, "checkout"))
> + return RECURSE_SUBMODULES_ON;
> + if (die_on_error)
> + die("bad %s argument: %s", opt, arg);
> + return RECURSE_SUBMODULES_ERROR;
> + }
> +}
Ok so this function here reads a recurse submodules parameter which is
a boolean or it can be set to the word "checkout"? Why does checkout
need its own value separate from true? Just so that we have a synonym?
or so that we can expand on it in the future?
next prev parent reply other threads:[~2017-02-17 18:25 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-15 0:34 [RFCv3 PATCH 00/14] Checkout aware of Submodules! Stefan Beller
2017-02-15 0:34 ` [PATCH 01/14] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-15 1:44 ` brian m. carlson
2017-02-15 0:34 ` [PATCH 02/14] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-15 16:51 ` Brandon Williams
2017-02-15 18:52 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 03/14] make is_submodule_populated gently Stefan Beller
2017-02-15 18:10 ` Junio C Hamano
2017-02-15 22:42 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 04/14] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-15 18:22 ` Junio C Hamano
2017-02-15 22:52 ` Stefan Beller
2017-02-15 23:19 ` Junio C Hamano
2017-02-15 0:34 ` [PATCH 05/14] update submodules: add submodule config parsing Stefan Beller
2017-02-15 18:29 ` Junio C Hamano
2017-02-15 0:34 ` [PATCH 06/14] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-15 0:34 ` [PATCH 07/14] update submodules: introduce is_interesting_submodule Stefan Beller
2017-02-15 17:04 ` Brandon Williams
2017-02-15 18:46 ` Stefan Beller
2017-02-15 0:34 ` [PATCH 08/14] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-15 0:34 ` [PATCH 09/14] update submodules: add submodule_go_from_to Stefan Beller
2017-02-15 2:06 ` brian m. carlson
2017-02-15 0:34 ` [PATCH 10/14] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-15 0:34 ` [PATCH 11/14] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-15 0:34 ` [PATCH 12/14] read-cache: remove_marked_cache_entries to wipe selected submodules Stefan Beller
2017-02-15 0:34 ` [PATCH 13/14] entry.c: update submodules when interesting Stefan Beller
2017-02-15 0:34 ` [PATCH 14/14] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-15 2:08 ` brian m. carlson
2017-02-16 0:33 ` Stefan Beller
2017-02-15 2:13 ` [RFCv3 PATCH 00/14] Checkout aware of Submodules! brian m. carlson
2017-02-15 18:34 ` Junio C Hamano
2017-02-16 0:37 ` [RFCv4 " Stefan Beller
2017-02-16 0:37 ` [PATCH 01/15] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-16 0:37 ` [PATCH 02/15] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-02-16 0:37 ` [PATCH 03/15] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-16 20:39 ` Junio C Hamano
2017-02-22 18:43 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 04/15] make is_submodule_populated gently Stefan Beller
2017-02-16 0:38 ` [PATCH 05/15] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-16 20:54 ` Junio C Hamano
2017-02-16 21:16 ` Stefan Beller
2017-02-16 21:25 ` Junio C Hamano
2017-02-16 0:38 ` [PATCH 06/15] update submodules: add submodule config parsing Stefan Beller
2017-02-17 18:24 ` Jacob Keller [this message]
2017-02-21 19:42 ` Stefan Beller
2017-02-21 20:48 ` Jacob Keller
2017-02-16 0:38 ` [PATCH 07/15] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-16 0:38 ` [PATCH 08/15] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-02-16 21:02 ` Junio C Hamano
2017-02-16 22:34 ` Jacob Keller
2017-02-17 18:36 ` Jacob Keller
2017-02-21 20:56 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 09/15] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-16 0:38 ` [PATCH 10/15] update submodules: add submodule_go_from_to Stefan Beller
2017-02-16 21:15 ` Junio C Hamano
2017-02-16 21:33 ` Stefan Beller
2017-02-16 0:38 ` [PATCH 11/15] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-16 21:19 ` Junio C Hamano
2017-02-16 0:38 ` [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-16 18:01 ` Brandon Williams
2017-02-16 21:23 ` Junio C Hamano
2017-02-17 18:42 ` Jacob Keller
2017-02-21 22:16 ` Stefan Beller
2017-02-21 23:35 ` Jacob Keller
2017-02-21 23:44 ` Stefan Beller
2017-02-22 0:31 ` Jacob Keller
2017-02-16 0:38 ` [PATCH 13/15] read-cache: remove_marked_cache_entries to wipe selected submodules Stefan Beller
2017-02-16 21:32 ` Junio C Hamano
2017-02-16 0:38 ` [PATCH 14/15] entry.c: update submodules when interesting Stefan Beller
2017-02-16 0:38 ` [PATCH 15/15] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-16 22:00 ` [RFCv4 PATCH 00/14] Checkout aware of Submodules! Junio C Hamano
2017-02-16 22:54 ` Jacob Keller
2017-02-16 22:56 ` Stefan Beller
2017-02-16 23:27 ` Jacob Keller
2017-02-23 22:57 ` [RFCv5 " Stefan Beller
2017-02-23 22:57 ` [PATCH 01/15] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-02-23 22:57 ` [PATCH 02/15] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-02-23 22:57 ` [PATCH 03/15] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 04/15] make is_submodule_populated gently Stefan Beller
2017-02-23 22:57 ` [PATCH 05/15] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-02-23 22:57 ` [PATCH 06/15] update submodules: add submodule config parsing Stefan Beller
2017-02-23 22:57 ` [PATCH 07/15] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-02-23 22:57 ` [PATCH 08/15] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-02-23 22:57 ` [PATCH 09/15] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-02-23 22:57 ` [PATCH 10/15] update submodules: add submodule_move_head Stefan Beller
2017-02-24 1:21 ` Ramsay Jones
2017-02-24 19:08 ` Stefan Beller
2017-02-23 22:57 ` [PATCH 11/15] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-02-23 22:57 ` [PATCH 12/15] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 13/15] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-02-23 22:57 ` [PATCH 14/15] entry.c: update submodules when interesting Stefan Beller
2017-02-23 22:57 ` [PATCH 15/15] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-02-24 1:25 ` Ramsay Jones
2017-02-24 19:20 ` 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
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='CA+P7+xozip8TuvyUe9vAPYLAg=QFieExhOyR7a0pgGFhiuO3jw@mail.gmail.com' \
--to=jacob.keller@gmail.com \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=sandals@crustytoothpaste.net \
--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.
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).