merge-tree: rename merge_trees() to trivial_merge_trees()
merge-recursive.h defined its own merge_trees() function, different than the one found in builtin/merge-tree.c. That was okay in the past, but we want merge-tree to be able to use the merge-ort functions, which will end up including merge-recursive.h. Rename the function found in builtin/merge-tree.c to avoid the conflict. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Jun 18, 2022 at 00:20 UTC
70176b70156f02bf4345ee091e664430f58ab32b
1 file changed
+4
-4
builtin/merge-tree.c
+4
-4
@@ -28,7 +28,7 @@ static void add_merge_entry(struct merge_list *entry)
28
merge_result_end = &entry->next;
29
}
30
31
-static void merge_trees(struct tree_desc t[3], const char *base);
31
+static void trivial_merge_trees(struct tree_desc t[3], const char *base);
32
33
static const char *explanation(struct merge_list *entry)
34
{
@@ -225,7 +225,7 @@ static void unresolved_directory(const struct traverse_info *info,
225
buf2 = fill_tree_descriptor(r, t + 2, ENTRY_OID(n + 2));
226
#undef ENTRY_OID
227
228
- merge_trees(t, newbase);
228
+ trivial_merge_trees(t, newbase);
229
230
free(buf0);
231
free(buf1);
@@ -342,7 +342,7 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s
342
return mask;
343
}
344
345
-static void merge_trees(struct tree_desc t[3], const char *base)
345
+static void trivial_merge_trees(struct tree_desc t[3], const char *base)
346
{
347
struct traverse_info info;
348
@@ -378,7 +378,7 @@ int cmd_merge_tree(int argc, const char **argv, const char *prefix)
378
buf1 = get_tree_descriptor(r, t+0, argv[1]);
379
buf2 = get_tree_descriptor(r, t+1, argv[2]);
380
buf3 = get_tree_descriptor(r, t+2, argv[3]);
381
- merge_trees(t, "");
381
+ trivial_merge_trees(t, "");
382
free(buf1);
383
free(buf2);
384
free(buf3);