mirror of
https://github.com/git/git.git
synced 2024-05-27 00:36:37 +02:00
e394fa01d6
"git checkout" is taught the "--recurse-submodules" option. * sb/checkout-recurse-submodules: builtin/read-tree: add --recurse-submodules switch builtin/checkout: add --recurse-submodules switch entry.c: create submodules when interesting unpack-trees: check if we can perform the operation for submodules unpack-trees: pass old oid to verify_clean_submodule update submodules: add submodule_move_head submodule.c: get_super_prefix_or_empty update submodules: move up prepare_submodule_repo_env submodules: introduce check to see whether to touch a submodule update submodules: add a config option to determine if submodules are updated update submodules: add submodule config parsing make is_submodule_populated gently lib-submodule-update.sh: define tests for recursing into submodules lib-submodule-update.sh: replace sha1 by hash lib-submodule-update: teach test_submodule_content the -C <dir> flag lib-submodule-update.sh: do not use ./. as submodule remote lib-submodule-update.sh: reorder create_lib_submodule_repo submodule--helper.c: remove duplicate code connect_work_tree_and_git_dir: safely create leading directories
126 lines
4.8 KiB
C
126 lines
4.8 KiB
C
#ifndef SUBMODULE_H
|
|
#define SUBMODULE_H
|
|
|
|
struct diff_options;
|
|
struct argv_array;
|
|
struct sha1_array;
|
|
|
|
enum {
|
|
RECURSE_SUBMODULES_ONLY = -5,
|
|
RECURSE_SUBMODULES_CHECK = -4,
|
|
RECURSE_SUBMODULES_ERROR = -3,
|
|
RECURSE_SUBMODULES_NONE = -2,
|
|
RECURSE_SUBMODULES_ON_DEMAND = -1,
|
|
RECURSE_SUBMODULES_OFF = 0,
|
|
RECURSE_SUBMODULES_DEFAULT = 1,
|
|
RECURSE_SUBMODULES_ON = 2
|
|
};
|
|
|
|
enum submodule_update_type {
|
|
SM_UPDATE_UNSPECIFIED = 0,
|
|
SM_UPDATE_CHECKOUT,
|
|
SM_UPDATE_REBASE,
|
|
SM_UPDATE_MERGE,
|
|
SM_UPDATE_NONE,
|
|
SM_UPDATE_COMMAND
|
|
};
|
|
|
|
struct submodule_update_strategy {
|
|
enum submodule_update_type type;
|
|
const char *command;
|
|
};
|
|
#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
|
|
|
|
extern int is_staging_gitmodules_ok(void);
|
|
extern int update_path_in_gitmodules(const char *oldpath, const char *newpath);
|
|
extern int remove_path_from_gitmodules(const char *path);
|
|
extern void stage_updated_gitmodules(void);
|
|
extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
|
|
const char *path);
|
|
extern int submodule_config(const char *var, const char *value, void *cb);
|
|
extern void gitmodules_config(void);
|
|
extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
|
|
extern int is_submodule_initialized(const char *path);
|
|
/*
|
|
* Determine if a submodule has been populated at a given 'path' by checking if
|
|
* the <path>/.git resolves to a valid git repository.
|
|
* If return_error_code is NULL, die on error.
|
|
* Otherwise the return error code is the same as of resolve_gitdir_gently.
|
|
*/
|
|
extern int is_submodule_populated_gently(const char *path, int *return_error_code);
|
|
extern int parse_submodule_update_strategy(const char *value,
|
|
struct submodule_update_strategy *dst);
|
|
extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
|
|
extern void handle_ignore_submodules_arg(struct diff_options *, const char *);
|
|
extern void show_submodule_summary(FILE *f, const char *path,
|
|
const char *line_prefix,
|
|
struct object_id *one, struct object_id *two,
|
|
unsigned dirty_submodule, const char *meta,
|
|
const char *del, const char *add, const char *reset);
|
|
extern void show_submodule_inline_diff(FILE *f, const char *path,
|
|
const char *line_prefix,
|
|
struct object_id *one, struct object_id *two,
|
|
unsigned dirty_submodule, const char *meta,
|
|
const char *del, const char *add, const char *reset,
|
|
const struct diff_options *opt);
|
|
extern void set_config_fetch_recurse_submodules(int value);
|
|
extern void set_config_update_recurse_submodules(int value);
|
|
/* Check if we want to update any submodule.*/
|
|
extern int should_update_submodules(void);
|
|
/*
|
|
* Returns the submodule struct if the given ce entry is a submodule
|
|
* and it should be updated. Returns NULL otherwise.
|
|
*/
|
|
extern const struct submodule *submodule_from_ce(const struct cache_entry *ce);
|
|
extern void check_for_new_submodule_commits(unsigned char new_sha1[20]);
|
|
extern int fetch_populated_submodules(const struct argv_array *options,
|
|
const char *prefix, int command_line_option,
|
|
int quiet, int max_parallel_jobs);
|
|
extern unsigned is_submodule_modified(const char *path, int ignore_untracked);
|
|
extern int submodule_uses_gitfile(const char *path);
|
|
|
|
#define SUBMODULE_REMOVAL_DIE_ON_ERROR (1<<0)
|
|
#define SUBMODULE_REMOVAL_IGNORE_UNTRACKED (1<<1)
|
|
#define SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED (1<<2)
|
|
extern int bad_to_remove_submodule(const char *path, unsigned flags);
|
|
extern 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], int search);
|
|
extern int find_unpushed_submodules(struct sha1_array *commits,
|
|
const char *remotes_name,
|
|
struct string_list *needs_pushing);
|
|
extern int push_unpushed_submodules(struct sha1_array *commits,
|
|
const char *remotes_name,
|
|
int dry_run);
|
|
extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
|
|
extern int parallel_submodules(void);
|
|
|
|
#define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0)
|
|
#define SUBMODULE_MOVE_HEAD_FORCE (1<<1)
|
|
extern int submodule_move_head(const char *path,
|
|
const char *old,
|
|
const char *new,
|
|
unsigned flags);
|
|
|
|
/*
|
|
* Prepare the "env_array" parameter of a "struct child_process" for executing
|
|
* a submodule by clearing any repo-specific envirionment variables, but
|
|
* retaining any config in the environment.
|
|
*/
|
|
extern void prepare_submodule_repo_env(struct argv_array *out);
|
|
|
|
#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
|
|
extern void absorb_git_dir_into_superproject(const char *prefix,
|
|
const char *path,
|
|
unsigned flags);
|
|
|
|
/*
|
|
* Return the absolute path of the working tree of the superproject, which this
|
|
* project is a submodule of. If this repository is not a submodule of
|
|
* another repository, return NULL.
|
|
*/
|
|
extern const char *get_superproject_working_tree(void);
|
|
|
|
#endif
|