mirror of
https://github.com/git/git.git
synced 2024-11-29 04:54:56 +08:00
8d676d85f7
* gv/portable:
test-lib: use DIFF definition from GIT-BUILD-OPTIONS
build: propagate $DIFF to scripts
Makefile: Tru64 portability fix
Makefile: HP-UX 10.20 portability fixes
Makefile: HPUX11 portability fixes
Makefile: SunOS 5.6 portability fix
inline declaration does not work on AIX
Allow disabling "inline"
Some platforms lack socklen_t type
Make NO_{INET_NTOP,INET_PTON} configured independently
Makefile: some platforms do not have hstrerror anywhere
git-compat-util.h: some platforms with mmap() lack MAP_FAILED definition
test_cmp: do not use "diff -u" on platforms that lack one
fixup: do not unconditionally disable "diff -u"
tests: use "test_cmp", not "diff", when verifying the result
Do not use "diff" found on PATH while building and installing
enums: omit trailing comma for portability
Makefile: -lpthread may still be necessary when libc has only pthread stubs
Rewrite dynamic structure initializations to runtime assignment
Makefile: pass CPPFLAGS through to fllow customization
Conflicts:
Makefile
wt-status.h
61 lines
1.6 KiB
C
61 lines
1.6 KiB
C
#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;
|
|
int verbosity;
|
|
int diff_rename_limit;
|
|
int merge_rename_limit;
|
|
int call_depth;
|
|
struct strbuf obuf;
|
|
struct string_list current_file_set;
|
|
struct string_list current_directory_set;
|
|
};
|
|
|
|
/* Return a list of user-friendly error messages to be used by merge */
|
|
struct unpack_trees_error_msgs get_porcelain_error_msgs(void);
|
|
|
|
/* 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);
|
|
|
|
/* builtin/merge.c */
|
|
int try_merge_command(const char *strategy, struct commit_list *common, const char *head_arg, struct commit_list *remotes);
|
|
|
|
#endif
|