mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
![Junio C Hamano](/assets/img/avatar_default.png)
"git pull --rebase --recurse-submodules" learns to rebase the branch in the submodules to an updated base. * sb/pull-rebase-submodule: builtin/fetch cleanup: always set default value for submodule recursing pull: optionally rebase submodules (remote submodule changes only) builtin/fetch: parse recurse-submodules-default at default options parsing builtin/fetch: factor submodule recurse parsing out to submodule config
52 lines
1.8 KiB
C
52 lines
1.8 KiB
C
#ifndef SUBMODULE_CONFIG_CACHE_H
|
|
#define SUBMODULE_CONFIG_CACHE_H
|
|
|
|
#include "hashmap.h"
|
|
#include "submodule.h"
|
|
#include "strbuf.h"
|
|
|
|
/*
|
|
* Submodule entry containing the information about a certain submodule
|
|
* in a certain revision.
|
|
*/
|
|
struct submodule {
|
|
const char *path;
|
|
const char *name;
|
|
const char *url;
|
|
int fetch_recurse;
|
|
const char *ignore;
|
|
const char *branch;
|
|
struct submodule_update_strategy update_strategy;
|
|
/* the sha1 blob id of the responsible .gitmodules file */
|
|
unsigned char gitmodules_sha1[20];
|
|
int recommend_shallow;
|
|
};
|
|
|
|
struct submodule_cache;
|
|
struct repository;
|
|
|
|
extern void submodule_cache_free(struct submodule_cache *cache);
|
|
|
|
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);
|
|
extern int submodule_config_option(struct repository *repo,
|
|
const char *var, const char *value);
|
|
extern const struct submodule *submodule_from_name(
|
|
const unsigned char *commit_or_tree, const char *name);
|
|
extern const struct submodule *submodule_from_path(
|
|
const unsigned char *commit_or_tree, const char *path);
|
|
extern const struct submodule *submodule_from_cache(struct repository *repo,
|
|
const unsigned char *treeish_name,
|
|
const char *key);
|
|
extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
|
|
unsigned char *gitmodules_sha1,
|
|
struct strbuf *rev);
|
|
extern void submodule_free(void);
|
|
|
|
#endif /* SUBMODULE_CONFIG_H */
|