git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: sbeller@google.com, gitster@pobox.com
Cc: git@vger.kernel.org, bmwill@google.com, novalis@novalis.org,
	sandals@crustytoothpaste.net, hvoigt@hvoigt.net,
	jrnieder@gmail.com, ramsay@ramsayjones.plus.com
Subject: [PATCH 08/17] update submodules: add submodule config parsing
Date: Thu,  9 Mar 2017 14:15:34 -0800	[thread overview]
Message-ID: <20170309221543.15897-9-sbeller@google.com> (raw)
In-Reply-To: <20170309221543.15897-1-sbeller@google.com>

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 | 20 ++++++++++++++++++++
 submodule-config.h | 17 +++++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/submodule-config.c b/submodule-config.c
index 93453909cf..3e8e380d98 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -234,6 +234,26 @@ 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 (die_on_error)
+			die("bad %s argument: %s", opt, arg);
+		return RECURSE_SUBMODULES_ERROR;
+	}
+}
+
+int parse_update_recurse_submodules_arg(const char *opt, const char *arg)
+{
+	return parse_update_recurse(opt, arg, 1);
+}
+
 static int parse_push_recurse(const char *opt, const char *arg,
 			       int die_on_error)
 {
diff --git a/submodule-config.h b/submodule-config.h
index 70f19363fd..d434ecdb45 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -22,16 +22,17 @@ struct submodule {
 	int recommend_shallow;
 };
 
-int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
-int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-int parse_submodule_config_option(const char *var, const char *value);
-const struct submodule *submodule_from_name(const unsigned char *commit_or_tree,
-		const char *name);
-const struct submodule *submodule_from_path(const unsigned char *commit_or_tree,
-		const char *path);
+extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
+extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
+extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
+extern int parse_submodule_config_option(const char *var, const char *value);
+extern const struct submodule *submodule_from_name(
+		const unsigned char *commit_or_tree, const char *name);
+extern const struct submodule *submodule_from_path(
+		const unsigned char *commit_or_tree, const char *path);
 extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
 				      unsigned char *gitmodules_sha1,
 				      struct strbuf *rev);
-void submodule_free(void);
+extern void submodule_free(void);
 
 #endif /* SUBMODULE_CONFIG_H */
-- 
2.12.0.rc1.45.g207f5fbb2b


  parent reply	other threads:[~2017-03-09 22:16 UTC|newest]

Thread overview: 100+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20170223225735.10994-1-sbeller@google.com/>
2017-03-02  0:47 ` [RFCv6 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-02  0:47   ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-02  0:47   ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-02  0:47   ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-02  2:11     ` Eric Wong
2017-03-06 20:30       ` Stefan Beller
2017-03-06 20:35         ` Stefan Beller
2017-03-02  0:47   ` [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-02  0:47   ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-02  0:47   ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-02  0:47   ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-02  0:47   ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-02  0:47   ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-02  0:47   ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-02  0:47   ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-02  0:47   ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-02  0:47   ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-02  0:47   ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-02  0:47   ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-02  0:47   ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-06 20:59   ` [RFCv7 PATCH 00/18] Checkout aware of Submodules! Stefan Beller
2017-03-06 20:59     ` [PATCH 01/18] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-06 20:59     ` [PATCH 02/18] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-06 20:59     ` [PATCH 03/18] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-06 22:21       ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 04/18] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-06 20:59     ` [PATCH 05/18] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-07 22:26       ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 06/18] make is_submodule_populated gently Stefan Beller
2017-03-06 20:59     ` [PATCH 07/18] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-06 20:59     ` [PATCH 08/18] update submodules: add submodule config parsing Stefan Beller
2017-03-06 20:59     ` [PATCH 09/18] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-06 20:59     ` [PATCH 10/18] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-06 20:59     ` [PATCH 11/18] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-06 20:59     ` [PATCH 12/18] update submodules: add submodule_move_head Stefan Beller
2017-03-06 20:59     ` [PATCH 13/18] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-06 20:59     ` [PATCH 14/18] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-06 20:59     ` [PATCH 15/18] read-cache, remove_marked_cache_entries: wipe selected submodules Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-07 23:37         ` Stefan Beller
2017-03-08  1:14           ` Junio C Hamano
2017-03-08 22:39             ` Stefan Beller
2017-03-08 23:37               ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 16/18] entry.c: update submodules when interesting Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-07 23:04         ` Junio C Hamano
2017-03-07 23:08           ` Stefan Beller
2017-03-08  1:08             ` Junio C Hamano
2017-03-06 20:59     ` [PATCH 17/18] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-06 20:59     ` [PATCH 18/18] builtin/read-tree: " Stefan Beller
2017-03-07 22:42       ` Junio C Hamano
2017-03-09 22:15     ` [RFCv8 PATCH 00/17] Checkout aware of Submodules! Stefan Beller
2017-03-09 22:15       ` [PATCH 01/17] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-09 22:15       ` [PATCH 02/17] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-09 22:15       ` [PATCH 03/17] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-09 22:15       ` [PATCH 04/17] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-09 22:15       ` [PATCH 05/17] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-09 22:15       ` [PATCH 06/17] make is_submodule_populated gently Stefan Beller
2017-03-09 22:15       ` [PATCH 07/17] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-09 23:29         ` Brandon Williams
2017-03-12  7:06           ` Junio C Hamano
2017-03-09 22:15       ` Stefan Beller [this message]
2017-03-09 22:15       ` [PATCH 09/17] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-09 22:15       ` [PATCH 10/17] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-09 22:15       ` [PATCH 11/17] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-09 22:15       ` [PATCH 12/17] update submodules: add submodule_move_head Stefan Beller
2017-03-09 23:37         ` Brandon Williams
2017-03-12  7:09           ` Junio C Hamano
2017-03-13 17:24             ` Brandon Williams
2017-03-13 20:50             ` Stefan Beller
2017-03-09 23:40         ` Brandon Williams
2017-03-09 23:43         ` Brandon Williams
2017-03-09 22:15       ` [PATCH 13/17] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-09 22:15       ` [PATCH 14/17] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-09 22:15       ` [PATCH 15/17] entry.c: create submodules when interesting Stefan Beller
2017-03-09 22:15       ` [PATCH 16/17] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-09 22:15       ` [PATCH 17/17] builtin/read-tree: " Stefan Beller
2017-03-14 21:46       ` [PATCHv9 00/19] Checkout aware of Submodules! Stefan Beller
2017-03-14 21:46         ` [PATCH 01/19] connect_work_tree_and_git_dir: safely create leading directories Stefan Beller
2017-03-14 21:46         ` [PATCH 02/19] submodule--helper.c: remove duplicate code Stefan Beller
2017-03-14 21:46         ` [PATCH 03/19] lib-submodule-update.sh: reorder create_lib_submodule_repo Stefan Beller
2017-03-14 21:46         ` [PATCH 04/19] lib-submodule-update.sh: do not use ./. as submodule remote Stefan Beller
2017-03-14 21:46         ` [PATCH 05/19] lib-submodule-update: teach test_submodule_content the -C <dir> flag Stefan Beller
2017-03-14 21:46         ` [PATCH 06/19] lib-submodule-update.sh: replace sha1 by hash Stefan Beller
2017-03-14 21:46         ` [PATCH 07/19] lib-submodule-update.sh: define tests for recursing into submodules Stefan Beller
2017-03-14 21:46         ` [PATCH 08/19] make is_submodule_populated gently Stefan Beller
2017-03-14 21:46         ` [PATCH 09/19] update submodules: add submodule config parsing Stefan Beller
2017-03-14 21:46         ` [PATCH 10/19] update submodules: add a config option to determine if submodules are updated Stefan Beller
2017-03-14 21:46         ` [PATCH 11/19] submodules: introduce check to see whether to touch a submodule Stefan Beller
2017-03-14 21:46         ` [PATCH 12/19] update submodules: move up prepare_submodule_repo_env Stefan Beller
2017-03-14 21:46         ` [PATCH 13/19] submodule.c: get_super_prefix_or_empty Stefan Beller
2017-03-14 21:46         ` [PATCH 14/19] update submodules: add submodule_move_head Stefan Beller
2017-03-14 21:46         ` [PATCH 15/19] unpack-trees: pass old oid to verify_clean_submodule Stefan Beller
2017-03-14 21:46         ` [PATCH 16/19] unpack-trees: check if we can perform the operation for submodules Stefan Beller
2017-03-14 21:46         ` [PATCH 17/19] entry.c: create submodules when interesting Stefan Beller
2017-03-14 21:46         ` [PATCH 18/19] builtin/checkout: add --recurse-submodules switch Stefan Beller
2017-03-14 21:46         ` [PATCH 19/19] builtin/read-tree: " Stefan Beller
2017-03-15  0:41         ` [PATCHv9 00/19] Checkout aware of Submodules! Brandon Williams

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=20170309221543.15897-9-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=bmwill@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=hvoigt@hvoigt.net \
    --cc=jrnieder@gmail.com \
    --cc=novalis@novalis.org \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sandals@crustytoothpaste.net \
    /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).