Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Newer
Older
100644 38 lines (33 sloc) 1.536 kB
752c0c2 @dscho Add the --submodule option to the diff option family
dscho authored
1 #ifndef SUBMODULE_H
2 #define SUBMODULE_H
3
46a958b @jlehmann Add the option "--ignore-submodules" to "git status"
jlehmann authored
4 struct diff_options;
50d89ad @jlehmann submodule: use argv_array instead of hand-building arrays
jlehmann authored
5 struct argv_array;
46a958b @jlehmann Add the option "--ignore-submodules" to "git status"
jlehmann authored
6
88a2197 @jlehmann fetch/pull: recurse into submodules when necessary
jlehmann authored
7 enum {
8 RECURSE_SUBMODULES_ON_DEMAND = -1,
9 RECURSE_SUBMODULES_OFF = 0,
10 RECURSE_SUBMODULES_DEFAULT = 1,
11 RECURSE_SUBMODULES_ON = 2
12 };
13
aee9c7d @jlehmann Submodules: Add the new "ignore" config option for diff and status
jlehmann authored
14 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
15 const char *path);
7dce19d @jlehmann fetch/pull: Add the --recurse-submodules option
jlehmann authored
16 int submodule_config(const char *var, const char *value, void *cb);
c2df758 submodule: fix prototype of gitmodules_config
René Scharfe authored
17 void gitmodules_config(void);
aee9c7d @jlehmann Submodules: Add the new "ignore" config option for diff and status
jlehmann authored
18 int parse_submodule_config_option(const char *var, const char *value);
46a958b @jlehmann Add the option "--ignore-submodules" to "git status"
jlehmann authored
19 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
88a2197 @jlehmann fetch/pull: recurse into submodules when necessary
jlehmann authored
20 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
752c0c2 @dscho Add the --submodule option to the diff option family
dscho authored
21 void show_submodule_summary(FILE *f, const char *path,
22 unsigned char one[20], unsigned char two[20],
721ceec @jlehmann Teach diff --submodule that modified submodule directory is dirty
jlehmann authored
23 unsigned dirty_submodule,
752c0c2 @dscho Add the --submodule option to the diff option family
dscho authored
24 const char *del, const char *add, const char *reset);
be254a0 @jlehmann Add the 'fetch.recurseSubmodules' config setting
jlehmann authored
25 void set_config_fetch_recurse_submodules(int value);
88a2197 @jlehmann fetch/pull: recurse into submodules when necessary
jlehmann authored
26 void check_for_new_submodule_commits(unsigned char new_sha1[20]);
50d89ad @jlehmann submodule: use argv_array instead of hand-building arrays
jlehmann authored
27 int fetch_populated_submodules(const struct argv_array *options,
8f0700d @jlehmann fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
jlehmann authored
28 const char *prefix, int command_line_option,
be254a0 @jlehmann Add the 'fetch.recurseSubmodules' config setting
jlehmann authored
29 int quiet);
3bfc450 @jlehmann git status: ignoring untracked files must apply to submodules too
jlehmann authored
30 unsigned is_submodule_modified(const char *path, int ignore_untracked);
68d03e4 Implement automatic fast-forward merge for submodules
Heiko Voigt authored
31 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
8098878 @bradking submodule: Search for merges only at end of recursive merge
bradking authored
32 const unsigned char a[20], const unsigned char b[20], int search);
a762e51 Refactor submodule push check to use string list instead of integer
Heiko Voigt authored
33 int find_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name,
34 struct string_list *needs_pushing);
eb21c73 push: teach --recurse-submodules the on-demand option
Heiko Voigt authored
35 int push_unpushed_submodules(unsigned char new_sha1[20], const char *remotes_name);
752c0c2 @dscho Add the --submodule option to the diff option family
dscho authored
36
37 #endif
Something went wrong with that request. Please try again.