mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce 'submodule.recurse' option for worktree manipulators

Browse Source 
Any command that understands '--recurse-submodules' can have its
default changed to true, by setting the new 'submodule.recurse'
option.

This patch includes read-tree/checkout/reset for working tree
manipulating commands. Later patches will cover other commands.

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-05-31 17:30:47 -07:00
committed by Junio C Hamano
parent 1d789d0892
commit 046b48239e
7 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
submodule.c
View File

@ -16,6 +16,7 @@
#include "quote.h"
#include "remote.h"
#include "worktree.h"
#include "parse-options.h"
static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
@ -170,10 +171,28 @@ static int git_modules_config(const char *var, const char *value, void *cb)
return 0;
}
/* Loads all submodule settings from the config */
/* Loads all submodule settings from the config. */
int submodule_config(const char *var, const char *value, void *cb)
{
return git_modules_config(var, value, cb);
if (!strcmp(var, "submodule.recurse")) {
int v = git_config_bool(var, value) ?
RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
config_update_recurse_submodules = v;
return 0;
} else {
return git_modules_config(var, value, cb);
}
}
/* Cheap function that only determines if we're interested in submodules at all */
int git_default_submodule_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "submodule.recurse")) {
int v = git_config_bool(var, value) ?
RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
config_update_recurse_submodules = v;
}
return 0;
}
int option_parse_recurse_submodules_worktree_updater(const struct option *opt,