diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-19 11:44:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-19 11:45:08 -0700 |
| commit | 5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5 (patch) | |
| tree | 69e47a672d37c3e818c8516bd1529e33dcf2f34b /submodule.h | |
| parent | memoize common git-path "constant" files (diff) | |
| parent | submodule: allow erroneous values for the fetchRecurseSubmodules option (diff) | |
| download | tgif-5a1ba6b48a62bf55f9c8305d9850c3a8d22365c5.tar.xz | |
Merge 'hv/submodule-config' to 'sb/submodule-helper'
* hv/submodule-config:
submodule: allow erroneous values for the fetchRecurseSubmodules option
submodule: use new config API for worktree configurations
submodule: extract functions for config set and lookup
submodule: implement a config API for lookup of .gitmodules values
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/submodule.h b/submodule.h index 7beec4822b..5507c3d9a0 100644 --- a/submodule.h +++ b/submodule.h @@ -5,6 +5,8 @@ struct diff_options; struct argv_array; enum { + RECURSE_SUBMODULES_ERROR = -3, + RECURSE_SUBMODULES_NONE = -2, RECURSE_SUBMODULES_ON_DEMAND = -1, RECURSE_SUBMODULES_OFF = 0, RECURSE_SUBMODULES_DEFAULT = 1, @@ -19,9 +21,7 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, const char *path); int submodule_config(const char *var, const char *value, void *cb); void gitmodules_config(void); -int parse_submodule_config_option(const char *var, const char *value); void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); -int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg); void show_submodule_summary(FILE *f, const char *path, const char *line_prefix, unsigned char one[20], unsigned char two[20], |