X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=submodule.h;h=5350b0d5a0d16e12e96b983e6510cb1d4098f962;hb=b9a972691e3967166e642bd91ea229087a6b4874;hp=386f410a66d9c431a61c0e26c773f1b3452f0d09;hpb=039e84e30d38f51d68ab465bfae32ba8058b51a0;p=git.git diff --git a/submodule.h b/submodule.h index 386f410a6..5350b0d5a 100644 --- a/submodule.h +++ b/submodule.h @@ -3,15 +3,29 @@ struct diff_options; +enum { + RECURSE_SUBMODULES_ON_DEMAND = -1, + RECURSE_SUBMODULES_OFF = 0, + RECURSE_SUBMODULES_DEFAULT = 1, + RECURSE_SUBMODULES_ON = 2 +}; + 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(); 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, unsigned char one[20], unsigned char two[20], unsigned dirty_submodule, const char *del, const char *add, const char *reset); +void set_config_fetch_recurse_submodules(int value); +void check_for_new_submodule_commits(unsigned char new_sha1[20]); +int fetch_populated_submodules(int num_options, const char **options, + const char *prefix, int command_line_option, + int quiet); unsigned is_submodule_modified(const char *path, int ignore_untracked); int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], const unsigned char a[20], const unsigned char b[20]);