Permalink
Cannot retrieve contributors at this time
Name already in use
A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?
git/merge-recursive.h
Go to fileThis commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
63 lines (55 sloc)
1.58 KB
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#ifndef MERGE_RECURSIVE_H | |
#define MERGE_RECURSIVE_H | |
#include "string-list.h" | |
struct merge_options { | |
const char *ancestor; | |
const char *branch1; | |
const char *branch2; | |
enum { | |
MERGE_RECURSIVE_NORMAL = 0, | |
MERGE_RECURSIVE_OURS, | |
MERGE_RECURSIVE_THEIRS | |
} recursive_variant; | |
const char *subtree_shift; | |
unsigned buffer_output : 1; | |
unsigned renormalize : 1; | |
long xdl_opts; | |
int verbosity; | |
int detect_rename; | |
int diff_rename_limit; | |
int merge_rename_limit; | |
int rename_score; | |
int needed_rename_limit; | |
int show_rename_progress; | |
int call_depth; | |
struct strbuf obuf; | |
struct string_list current_file_set; | |
struct string_list current_directory_set; | |
struct string_list df_conflict_file_set; | |
}; | |
/* merge_trees() but with recursive ancestor consolidation */ | |
int merge_recursive(struct merge_options *o, | |
struct commit *h1, | |
struct commit *h2, | |
struct commit_list *ancestors, | |
struct commit **result); | |
/* rename-detecting three-way merge, no recursion */ | |
int merge_trees(struct merge_options *o, | |
struct tree *head, | |
struct tree *merge, | |
struct tree *common, | |
struct tree **result); | |
/* | |
* "git-merge-recursive" can be fed trees; wrap them into | |
* virtual commits and call merge_recursive() proper. | |
*/ | |
int merge_recursive_generic(struct merge_options *o, | |
const unsigned char *head, | |
const unsigned char *merge, | |
int num_ca, | |
const unsigned char **ca, | |
struct commit **result); | |
void init_merge_options(struct merge_options *o); | |
struct tree *write_tree_from_memory(struct merge_options *o); | |
int parse_merge_opt(struct merge_options *out, const char *s); | |
#endif |