Re: [PATCH 1/3] builtin/fetch: factor submodule recurse parsing out to submodule config

[Junio C Hamano <gitster@pobox.com>]

Stefan Beller <sbeller@google.com> writes:

> Later we want to access this parsing in builtin/pull as well.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  builtin/fetch.c    | 18 ++----------------
>  submodule-config.c | 22 ++++++++++++++++++++++
>  submodule-config.h |  3 +++
>  3 files changed, 27 insertions(+), 16 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 100248c5af..9d58dc0a8a 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -53,20 +53,6 @@ static int shown_url = 0;
>  static int refmap_alloc, refmap_nr;
>  static const char **refmap_array;
>  
> -static int option_parse_recurse_submodules(const struct option *opt,
> -				   const char *arg, int unset)
> -{
> -	if (unset) {
> -		recurse_submodules = RECURSE_SUBMODULES_OFF;
> -	} else {
> -		if (arg)
> -			recurse_submodules = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
> -		else
> -			recurse_submodules = RECURSE_SUBMODULES_ON;
> -	}
> -	return 0;
> -}
> -
>  static int git_fetch_config(const char *k, const char *v, void *cb)
>  {
>  	if (!strcmp(k, "fetch.prune")) {
> @@ -115,9 +101,9 @@ static struct option builtin_fetch_options[] = {
>  		    N_("number of submodules fetched in parallel")),
>  	OPT_BOOL('p', "prune", &prune,
>  		 N_("prune remote-tracking branches no longer on remote")),
> -	{ OPTION_CALLBACK, 0, "recurse-submodules", NULL, N_("on-demand"),
> +	{ OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
>  		    N_("control recursive fetching of submodules"),
> -		    PARSE_OPT_OPTARG, option_parse_recurse_submodules },
> +		    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
>  	OPT_BOOL(0, "dry-run", &dry_run,
>  		 N_("dry run")),
>  	OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
> diff --git a/submodule-config.c b/submodule-config.c
> index 4f58491ddb..265d036095 100644
> --- a/submodule-config.c
> +++ b/submodule-config.c
> @@ -2,6 +2,7 @@
>  #include "submodule-config.h"
>  #include "submodule.h"
>  #include "strbuf.h"
> +#include "parse-options.h"
>  
>  /*
>   * submodule cache lookup structure
> @@ -234,6 +235,27 @@ int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
>  	return parse_fetch_recurse(opt, arg, 1);
>  }
>  
> +int option_fetch_parse_recurse_submodules(const struct option *opt,
> +					  const char *arg, int unset)
> +{
> +	int *v;
> +
> +	if (!opt->value)
> +		return -1;

It would have been easier to view this change if the original
already had used opt->value to specify where to place the parsed
value, but that is water under the bridge ;-)

Looks like a faithful converison to me.

> +	v = opt->value;
> +
> +	if (unset) {
> +		*v = RECURSE_SUBMODULES_OFF;
> +	} else {
> +		if (arg)
> +			*v = parse_fetch_recurse_submodules_arg(opt->long_name, arg);
> +		else
> +			*v = RECURSE_SUBMODULES_ON;
> +	}
> +	return 0;
> +}
> +
>  static int parse_update_recurse(const char *opt, const char *arg,
>  				int die_on_error)
>  {
> diff --git a/submodule-config.h b/submodule-config.h
> index d434ecdb45..1076a68653 100644
> --- a/submodule-config.h
> +++ b/submodule-config.h
> @@ -23,6 +23,9 @@ struct submodule {
>  };
>  
>  extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
> +struct option;
> +extern int option_fetch_parse_recurse_submodules(const struct option *opt,
> +						 const char *arg, int unset);
>  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);