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@xxxxxxxxx>
---
merge-recursive.h | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/merge-recursive.h b/merge-recursive.h
index c7ba8d0a71..c201de0fc3 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -64,10 +64,10 @@ struct collision_entry {
unsigned reported_already:1;
};
-static inline int merge_detect_rename(struct merge_options *o)
+static inline int merge_detect_rename(struct merge_options *opt)
{
- return o->merge_detect_rename >= 0 ? o->merge_detect_rename :
- o->diff_detect_rename >= 0 ? o->diff_detect_rename : 1;
+ return opt->merge_detect_rename >= 0 ? opt->merge_detect_rename :
+ opt->diff_detect_rename >= 0 ? opt->diff_detect_rename : 1;
}
/*
@@ -81,7 +81,7 @@ static inline int merge_detect_rename(struct merge_options *o)
* commit. Also, merge_bases will be consumed (emptied) so make a
* copy if you need it.
*/
-int merge_recursive(struct merge_options *o,
+int merge_recursive(struct merge_options *opt,
struct commit *h1,
struct commit *h2,
struct commit_list *merge_bases,
@@ -91,7 +91,7 @@ int merge_recursive(struct merge_options *o,
* rename-detecting three-way merge, no recursion; result of merge is written
* to opt->repo->index.
*/
-int merge_trees(struct merge_options *o,
+int merge_trees(struct merge_options *opt,
struct tree *head,
struct tree *merge,
struct tree *merge_base);
@@ -100,16 +100,16 @@ int merge_trees(struct merge_options *o,
* "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,
+int merge_recursive_generic(struct merge_options *opt,
const struct object_id *head,
const struct object_id *merge,
int num_merge_bases,
const struct object_id **merge_bases,
struct commit **result);
-void init_merge_options(struct merge_options *o,
+void init_merge_options(struct merge_options *opt,
struct repository *repo);
-int parse_merge_opt(struct merge_options *out, const char *s);
+int parse_merge_opt(struct merge_options *opt, const char *s);
#endif
--
2.22.0.550.g71c37a0928.dirty
