From: Brandon Williams <bmwill@google.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com,
sandals@crustytoothpaste.net, gitster@pobox.com
Subject: Re: [PATCH 07/14] update submodules: introduce is_interesting_submodule
Date: Wed, 15 Feb 2017 09:04:41 -0800 [thread overview]
Message-ID: <20170215170441.GB29448@google.com> (raw)
In-Reply-To: <20170215003423.20245-8-sbeller@google.com>
On 02/14, Stefan Beller wrote:
> In later patches we introduce the --recurse-submodule flag for commands
> that modify the working directory, e.g. git-checkout.
>
> It is potentially expensive to check if a submodule needs an update,
> because a common theme to interact with submodules is to spawn a child
> process for each interaction.
>
> So let's introduce a function that pre checks if a submodule needs
> to be checked for an update.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> submodule.c | 26 ++++++++++++++++++++++++++
> submodule.h | 8 ++++++++
> 2 files changed, 34 insertions(+)
>
> diff --git a/submodule.c b/submodule.c
> index c0060c29f2..4c33374ae8 100644
> --- a/submodule.c
> +++ b/submodule.c
> @@ -551,6 +551,32 @@ void set_config_update_recurse_submodules(int value)
> config_update_recurse_submodules = value;
> }
>
> +int submodules_interesting_for_update(void)
> +{
> + /*
> + * Update can't be "none", "merge" or "rebase",
> + * treat any value as OFF, except an explicit ON.
> + */
> + return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
> +}
> +
> +int is_interesting_submodule(const struct cache_entry *ce)
Is there perhaps a more descriptive function name we could use instead
of "is_interesting"? The problem is that its difficult to know why its
interesting or for what purpose it is interesting.
> +{
> + const struct submodule *sub;
> +
> + if (!S_ISGITLINK(ce->ce_mode))
> + return 0;
> +
> + if (!submodules_interesting_for_update())
> + return 0;
> +
> + sub = submodule_from_path(null_sha1, ce->name);
> + if (!sub)
> + return 0;
> +
> + return sub->update_strategy.type != SM_UPDATE_NONE;
> +}
> +
> static int has_remote(const char *refname, const struct object_id *oid,
> int flags, void *cb_data)
> {
> diff --git a/submodule.h b/submodule.h
> index c4e1ac828e..84b67a7c4a 100644
> --- a/submodule.h
> +++ b/submodule.h
> @@ -59,6 +59,14 @@ extern void show_submodule_inline_diff(FILE *f, const char *path,
> const struct diff_options *opt);
> extern void set_config_fetch_recurse_submodules(int value);
> extern void set_config_update_recurse_submodules(int value);
> +
> +/*
> + * Traditionally Git ignored changes made for submodules.
> + * This function checks if we are interested in the given submodule
> + * for any kind of operation.
> + */
> +extern int submodules_interesting_for_update(void);
> +extern int is_interesting_submodule(const struct cache_entry *ce);
> extern void check_for_new_submodule_commits(unsigned char new_sha1[20]);
> extern int fetch_populated_submodules(const struct argv_array *options,
> const char *prefix, int command_line_option,
> --
> 2.12.0.rc0.16.gd1691994b4.dirty
>
--
Brandon Williams
next prev parent reply other threads:[~2017-02-15 17:04 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 [this message]
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
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=20170215170441.GB29448@google.com \
--to=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).