File : merge-recursive.h - Ohloh Code Search

Project: Git

Code Location: git://github.com/git/git.gitmaster

Browse

Outline

> S merge_options
- V char ancestor
- V char branch1
- V char branch2
- E ?
  - Cn MERGE_RECURSIVE_NORMAL
  - Cn MERGE_RECURSIVE_OURS
  - Cn MERGE_RECURSIVE_THEIRS
- V recursive_variant
- V char subtree_shift
- V long xdl_opts
- V int verbosity
- V int diff_rename_limit
- V int merge_rename_limit
- V int rename_score
- V int needed_rename_limit
- V int show_rename_progress
- V int call_depth
- V strbuf obuf
- V string_list current_file_set
- V string_list current_directory_set
- V string_list df_conflict_file_set

> Fn int merge_recursive(merge_options*,commit*,commit*,commit_list*,commit*)

> Fn int merge_trees(merge_options*,tree*,tree*,tree*,tree*)

> Fn int merge_recursive_generic(merge_options*,unsignedchar*,unsignedchar*,int,unsignedchar*,commit*)

> Fn void init_merge_options(merge_options*)

> Fn tree write_tree_from_memory(merge_options*)

> Fn int parse_merge_opt(merge_options*,char*)

Download File

merge-recursive.h

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62

#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 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