grep: fix coloring of hunk marks between files
[git/jrn.git] / submodule.h
blob5350b0d5a0d16e12e96b983e6510cb1d4098f962
1 #ifndef SUBMODULE_H
2 #define SUBMODULE_H
4 struct diff_options;
6 enum {
7 RECURSE_SUBMODULES_ON_DEMAND = -1,
8 RECURSE_SUBMODULES_OFF = 0,
9 RECURSE_SUBMODULES_DEFAULT = 1,
10 RECURSE_SUBMODULES_ON = 2
13 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
14 const char *path);
15 int submodule_config(const char *var, const char *value, void *cb);
16 void gitmodules_config();
17 int parse_submodule_config_option(const char *var, const char *value);
18 void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
19 int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
20 void show_submodule_summary(FILE *f, const char *path,
21 unsigned char one[20], unsigned char two[20],
22 unsigned dirty_submodule,
23 const char *del, const char *add, const char *reset);
24 void set_config_fetch_recurse_submodules(int value);
25 void check_for_new_submodule_commits(unsigned char new_sha1[20]);
26 int fetch_populated_submodules(int num_options, const char **options,
27 const char *prefix, int command_line_option,
28 int quiet);
29 unsigned is_submodule_modified(const char *path, int ignore_untracked);
30 int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
31 const unsigned char a[20], const unsigned char b[20]);
33 #endif