mirror of
https://github.com/git/git.git
synced 2024-11-24 10:26:17 +08:00
d7a3803f9e
The callback function is essentially duplicated 3 times. Remove all
of them and offer a new callback function, that lives in submodule.c
By putting the callback function there, we no longer need the function
'set_config_update_recurse_submodules', nor duplicate the global variable
in each builtin as well as submodule.c
In the three builtins we have different 2 ways how to load the .gitmodules
and config file, which are slightly different. git-checkout has to load
the submodule config all the time due to 23b4c7bcc5
(checkout: Use
submodule.*.ignore settings from .git/config and .gitmodules, 2010-08-28)
git-reset and git-read-tree do not respect these diff settings, so loading
the submodule configuration is optional. Also put that into submodule.c
for code deduplication.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
139 lines
5.2 KiB
C
139 lines
5.2 KiB
C
#ifndef SUBMODULE_H
|
|
#define SUBMODULE_H
|
|
|
|
struct diff_options;
|
|
struct argv_array;
|
|
struct oid_array;
|
|
struct remote;
|
|
|
|
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);
|
|
|
|
struct option;
|
|
int option_parse_recurse_submodules_worktree_updater(const struct option *opt,
|
|
const char *arg, int unset);
|
|
void load_submodule_cache(void);
|
|
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);
|
|
/* 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(struct object_id *oid);
|
|
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 oid_array *commits,
|
|
const char *remotes_name,
|
|
struct string_list *needs_pushing);
|
|
extern int push_unpushed_submodules(struct oid_array *commits,
|
|
const struct remote *remote,
|
|
const char **refspec, int refspec_nr,
|
|
const struct string_list *push_options,
|
|
int dry_run);
|
|
extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
|
|
extern int parallel_submodules(void);
|
|
/*
|
|
* Given a submodule path (as in the index), return the repository
|
|
* path of that submodule in 'buf'. Return -1 on error or when the
|
|
* submodule is not initialized.
|
|
*/
|
|
int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
|
|
|
|
#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
|