80988783c8
The submodule merge search is not useful during virtual merges because
the results cannot be used automatically. Furthermore any suggestions
made by the search may apply to commits different than HEAD:sub and
MERGE_HEAD:sub, thus confusing the user. Skip searching for submodule
merges during a virtual merge such as that between B and C while merging
the heads of:
B---BC
/ \ /
A X
\ / \
C---CB
Run the search only when the recursion level is zero (!o->call_depth).
This fixes known breakage tested in t7405-submodule-merge.
Signed-off-by: Brad King <brad.king@kitware.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
35 lines
1.4 KiB
C
35 lines
1.4 KiB
C
#ifndef SUBMODULE_H
|
|
#define SUBMODULE_H
|
|
|
|
struct diff_options;
|
|
|
|
enum {
|
|
RECURSE_SUBMODULES_ON_DEMAND = -1,
|
|
RECURSE_SUBMODULES_OFF = 0,
|
|
RECURSE_SUBMODULES_DEFAULT = 1,
|
|
RECURSE_SUBMODULES_ON = 2
|
|
};
|
|
|
|
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
|
|
const char *path);
|
|
int submodule_config(const char *var, const char *value, void *cb);
|
|
void gitmodules_config();
|
|
int parse_submodule_config_option(const char *var, const char *value);
|
|
void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
|
|
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
|
|
void show_submodule_summary(FILE *f, const char *path,
|
|
unsigned char one[20], unsigned char two[20],
|
|
unsigned dirty_submodule,
|
|
const char *del, const char *add, const char *reset);
|
|
void set_config_fetch_recurse_submodules(int value);
|
|
void check_for_new_submodule_commits(unsigned char new_sha1[20]);
|
|
int fetch_populated_submodules(int num_options, const char **options,
|
|
const char *prefix, int command_line_option,
|
|
int quiet);
|
|
unsigned is_submodule_modified(const char *path, int ignore_untracked);
|
|
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);
|
|
int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
|
|
|
|
#endif
|