undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/fetch: factor submodule recurse parsing out to submodule config

Browse Source 
Later we want to access this parsing in builtin/pull as well.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2017-06-23 12:13:00 -07:00 committed by Junio C Hamano
parent 5402b1352f
commit 886dc154d8
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/fetch.c
View File

@ -53,20 +53,6 @@ static int shown_url = 0;
static int refmap_alloc, refmap_nr; static int refmap_alloc, refmap_nr;
static const char **refmap_array; 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) static int git_fetch_config(const char *k, const char *v, void *cb)
{ {
if (!strcmp(k, "fetch.prune")) { if (!strcmp(k, "fetch.prune")) {
@ -115,9 +101,9 @@ static struct option builtin_fetch_options[] = {
N_("number of submodules fetched in parallel")), N_("number of submodules fetched in parallel")),
OPT_BOOL('p', "prune", &prune, OPT_BOOL('p', "prune", &prune,
N_("prune remote-tracking branches no longer on remote")), 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"), 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, OPT_BOOL(0, "dry-run", &dry_run,
N_("dry run")), N_("dry run")),
OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")), OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),

22
submodule-config.c
View File

@ -2,6 +2,7 @@
#include "submodule-config.h" #include "submodule-config.h"
#include "submodule.h" #include "submodule.h"
#include "strbuf.h" #include "strbuf.h"
#include "parse-options.h"
/* /*
* submodule cache lookup structure * 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); 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;
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, static int parse_update_recurse(const char *opt, const char *arg,
int die_on_error) int die_on_error)
{ {

3
submodule-config.h
View File

@ -23,6 +23,9 @@ struct submodule {
}; };
extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); 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_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_push_recurse_submodules_arg(const char *opt, const char *arg);
extern int parse_submodule_config_option(const char *var, const char *value); extern int parse_submodule_config_option(const char *var, const char *value);