2009-10-19 14:38:32 +02:00
|
|
|
#ifndef SUBMODULE_H
|
|
|
|
#define SUBMODULE_H
|
|
|
|
|
2010-06-25 16:56:47 +02:00
|
|
|
struct diff_options;
|
2012-09-01 17:27:06 +02:00
|
|
|
struct argv_array;
|
2010-06-25 16:56:47 +02:00
|
|
|
|
2011-03-06 23:10:46 +01:00
|
|
|
enum {
|
2015-11-17 12:05:56 +01:00
|
|
|
RECURSE_SUBMODULES_CHECK = -4,
|
2015-08-18 02:22:00 +02:00
|
|
|
RECURSE_SUBMODULES_ERROR = -3,
|
2015-08-18 02:21:57 +02:00
|
|
|
RECURSE_SUBMODULES_NONE = -2,
|
2011-03-06 23:10:46 +01:00
|
|
|
RECURSE_SUBMODULES_ON_DEMAND = -1,
|
|
|
|
RECURSE_SUBMODULES_OFF = 0,
|
|
|
|
RECURSE_SUBMODULES_DEFAULT = 1,
|
|
|
|
RECURSE_SUBMODULES_ON = 2
|
|
|
|
};
|
|
|
|
|
2013-07-30 21:50:34 +02:00
|
|
|
int is_staging_gitmodules_ok(void);
|
2013-08-06 21:15:11 +02:00
|
|
|
int update_path_in_gitmodules(const char *oldpath, const char *newpath);
|
2013-08-06 21:15:25 +02:00
|
|
|
int remove_path_from_gitmodules(const char *path);
|
2013-07-30 21:50:34 +02:00
|
|
|
void stage_updated_gitmodules(void);
|
2010-08-06 00:39:25 +02:00
|
|
|
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
|
|
|
|
const char *path);
|
2010-11-12 13:54:52 +01:00
|
|
|
int submodule_config(const char *var, const char *value, void *cb);
|
2012-04-10 21:10:26 +02:00
|
|
|
void gitmodules_config(void);
|
2010-06-25 16:56:47 +02:00
|
|
|
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
|
2009-10-19 14:38:32 +02:00
|
|
|
void show_submodule_summary(FILE *f, const char *path,
|
2013-04-05 18:12:08 +02:00
|
|
|
const char *line_prefix,
|
2009-10-19 14:38:32 +02:00
|
|
|
unsigned char one[20], unsigned char two[20],
|
2012-11-13 16:42:47 +01:00
|
|
|
unsigned dirty_submodule, const char *meta,
|
2009-10-19 14:38:32 +02:00
|
|
|
const char *del, const char *add, const char *reset);
|
2010-11-11 00:55:02 +01:00
|
|
|
void set_config_fetch_recurse_submodules(int value);
|
2011-03-06 23:10:46 +01:00
|
|
|
void check_for_new_submodule_commits(unsigned char new_sha1[20]);
|
2012-09-01 17:27:06 +02:00
|
|
|
int fetch_populated_submodules(const struct argv_array *options,
|
2011-03-06 23:11:21 +01:00
|
|
|
const char *prefix, int command_line_option,
|
2015-12-16 01:04:12 +01:00
|
|
|
int quiet, int max_parallel_jobs);
|
2010-03-13 23:00:27 +01:00
|
|
|
unsigned is_submodule_modified(const char *path, int ignore_untracked);
|
2012-09-26 20:21:13 +02:00
|
|
|
int submodule_uses_gitfile(const char *path);
|
|
|
|
int ok_to_remove_submodule(const char *path);
|
2010-07-07 15:39:13 +02:00
|
|
|
int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
|
2011-10-13 14:59:05 +02:00
|
|
|
const unsigned char a[20], const unsigned char b[20], int search);
|
2012-03-29 09:21:23 +02:00
|
|
|
int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
|
|
|
|
struct string_list *needs_pushing);
|
2012-03-29 09:21:24 +02:00
|
|
|
int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
|
2013-07-30 21:50:03 +02:00
|
|
|
void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
|
2009-10-19 14:38:32 +02:00
|
|
|
|
2016-04-28 15:38:20 +02:00
|
|
|
/*
|
|
|
|
* Prepare the "env_array" parameter of a "struct child_process" for executing
|
|
|
|
* a submodule by clearing any repo-specific envirionment variables, but
|
submodule: stop sanitizing config options
The point of having a whitelist of command-line config
options to pass to submodules was two-fold:
1. It prevented obvious nonsense like using core.worktree
for multiple repos.
2. It could prevent surprise when the user did not mean
for the options to leak to the submodules (e.g.,
http.sslverify=false).
For case 1, the answer is mostly "if it hurts, don't do
that". For case 2, we can note that any such example has a
matching inverted surprise (e.g., a user who meant
http.sslverify=true to apply everywhere, but it didn't).
So this whitelist is probably not giving us any benefit, and
is already creating a hassle as people propose things to put
on it. Let's just drop it entirely.
Note that we still need to keep a special code path for
"prepare the submodule environment", because we still have
to take care to pass through $GIT_CONFIG_PARAMETERS (and
block the rest of the repo-specific environment variables).
We can do this easily from within the submodule shell
script, which lets us drop the submodule--helper option
entirely (and it's OK to do so because as a "--" program, it
is entirely a private implementation detail).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-05-05 03:22:19 +02:00
|
|
|
* retaining any config in the environment.
|
2016-04-28 15:38:20 +02:00
|
|
|
*/
|
|
|
|
void prepare_submodule_repo_env(struct argv_array *out);
|
|
|
|
|
2009-10-19 14:38:32 +02:00
|
|
|
#endif
|