merge-tree: remove unused df_conflict arguments
merge_trees_recursive() stores a pointer to its parameter df_conflict in its struct traverse_info, but it is never actually used. Stop doing that, remove the parameter and inline the function into merge_trees(), as the latter is now only passing on its parameters. Remove the parameter df_conflict from unresolved_directory() as well, now that there is no way to pass it to merge_trees_recursive() through that function anymore. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
René Scharfe committed
Aug 30, 2014 at 23:40 UTC
57065289a9ef2fc962ec7f82f9771b45eba8dba1
1 file changed
+6
-12
builtin/merge-tree.c
+6
-12
@@ -25,7 +25,7 @@ static void add_merge_entry(struct merge_list *entry)
25
merge_result_end = &entry->next;
26
}
27
28
-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict);
28
+static void merge_trees(struct tree_desc t[3], const char *base);
29
30
static const char *explanation(struct merge_list *entry)
31
{
@@ -195,8 +195,8 @@ static void resolve(const struct traverse_info *info, struct name_entry *ours, s
195
add_merge_entry(final);
196
}
197
198
-static void unresolved_directory(const struct traverse_info *info, struct name_entry n[3],
199
- int df_conflict)
198
+static void unresolved_directory(const struct traverse_info *info,
199
+ struct name_entry n[3])
200
{
201
char *newbase;
202
struct name_entry *p;
@@ -218,7 +218,7 @@ static void unresolved_directory(const struct traverse_info *info, struct name_e
218
buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
219
#undef ENTRY_SHA1
220
221
- merge_trees_recursive(t, newbase, df_conflict);
221
+ merge_trees(t, newbase);
222
223
free(buf0);
224
free(buf1);
@@ -259,7 +259,7 @@ static void unresolved(const struct traverse_info *info, struct name_entry n[3])
259
dirmask |= (1 << i);
260
}
261
262
- unresolved_directory(info, n, dirmask && (dirmask != mask));
262
+ unresolved_directory(info, n);
263
264
if (dirmask == mask)
265
return;
@@ -335,21 +335,15 @@ static int threeway_callback(int n, unsigned long mask, unsigned long dirmask, s
335
return mask;
336
}
337
338
-static void merge_trees_recursive(struct tree_desc t[3], const char *base, int df_conflict)
338
+static void merge_trees(struct tree_desc t[3], const char *base)
339
{
340
struct traverse_info info;
341
342
setup_traverse_info(&info, base);
343
- info.data = &df_conflict;
343
info.fn = threeway_callback;
344
traverse_trees(3, t, &info);
345
}
346
348
-static void merge_trees(struct tree_desc t[3], const char *base)
349
-{
350
- merge_trees_recursive(t, base, 0);
351
-}
352
-
347
static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
348
{
349
unsigned char sha1[20];