merge-recursive: rename merge_options argument to opt in header
In commit 259ccb6cc324 ("merge-recursive: rename merge_options argument from 'o' to 'opt'", 2019-04-05), I renamed a bunch of function arguments in merge-recursive.c, but forgot to make that same change to merge-recursive.h. Make the two match. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 17, 2019 at 11:41 UTC
c749ab1da812cdb1263f868c63fe1808a12dcff2
1 file changed
+8
-8
merge-recursive.h
+8
-8
@@ -68,10 +68,10 @@ struct collision_entry {
68
unsigned reported_already:1;
69
};
70
71
-static inline int merge_detect_rename(struct merge_options *o)
71
+static inline int merge_detect_rename(struct merge_options *opt)
72
{
73
- return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
74
- o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
73
+ return opt->merge_detect_rename >= 0 ? opt->merge_detect_rename :
74
+ opt->diff_detect_rename >= 0 ? opt->diff_detect_rename : 1;
75
}
76
77
/*
@@ -85,7 +85,7 @@ static inline int merge_detect_rename(struct merge_options *o)
85
* commit. Also, merge_bases will be consumed (emptied) so make a
86
* copy if you need it.
87
*/
88
-int merge_recursive(struct merge_options *o,
88
+int merge_recursive(struct merge_options *opt,
89
struct commit *h1,
90
struct commit *h2,
91
struct commit_list *merge_bases,
@@ -95,7 +95,7 @@ int merge_recursive(struct merge_options *o,
95
* rename-detecting three-way merge, no recursion; result of merge is written
96
* to opt->repo->index.
97
*/
98
-int merge_trees(struct merge_options *o,
98
+int merge_trees(struct merge_options *opt,
99
struct tree *head,
100
struct tree *merge,
101
struct tree *merge_base);
@@ -104,16 +104,16 @@ int merge_trees(struct merge_options *o,
104
* "git-merge-recursive" can be fed trees; wrap them into
105
* virtual commits and call merge_recursive() proper.
106
*/
107
-int merge_recursive_generic(struct merge_options *o,
107
+int merge_recursive_generic(struct merge_options *opt,
108
const struct object_id *head,
109
const struct object_id *merge,
110
int num_merge_bases,
111
const struct object_id **merge_bases,
112
struct commit **result);
113
114
-void init_merge_options(struct merge_options *o,
114
+void init_merge_options(struct merge_options *opt,
115
struct repository *repo);
116
117
-int parse_merge_opt(struct merge_options *out, const char *s);
117
+int parse_merge_opt(struct merge_options *opt, const char *s);
118
119
#endif