merge-recursive: drop several unused parameters
There are a few functions related to directory renames that have unused parameters. After consulting with the author in [1], these seem to be leftover cruft from the development process, and not signs of any bug. Let's drop them. [1] https://public-inbox.org/git/CABPp-BHobf8wbBsXF97scNQCzkxQukziODRXq6JOOWq61cAd9g@mail.gmail.com/ Helped-by: Elijah Newren <newren@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 14, 2019 at 00:50 UTC
b53c502807d760ec55db7e7520a360ee35ab7646
1 file changed
+7
-12
merge-recursive.c
+7
-12
@@ -1402,8 +1402,7 @@ static int merge_mode_and_contents(struct merge_options *o,
1402
1403
static int handle_rename_via_dir(struct merge_options *o,
1404
struct diff_filepair *pair,
1405
- const char *rename_branch,
1406
- const char *other_branch)
1405
+ const char *rename_branch)
1406
{
1407
/*
1408
* Handle file adds that need to be renamed due to directory rename
@@ -2213,8 +2212,7 @@ static void handle_directory_level_conflicts(struct merge_options *o,
2212
remove_hashmap_entries(dir_re_merge, &remove_from_merge);
2213
}
2214
2216
-static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs,
2217
- struct tree *tree)
2215
+static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs)
2216
{
2217
struct hashmap *dir_renames;
2218
struct hashmap_iter iter;
@@ -2460,8 +2458,7 @@ static void apply_directory_rename_modifications(struct merge_options *o,
2458
struct tree *o_tree,
2459
struct tree *a_tree,
2460
struct tree *b_tree,
2463
- struct string_list *entries,
2464
- int *clean)
2461
+ struct string_list *entries)
2462
{
2463
struct string_list_item *item;
2464
int stage = (tree == a_tree ? 2 : 3);
@@ -2632,8 +2629,7 @@ static struct string_list *get_renames(struct merge_options *o,
2629
apply_directory_rename_modifications(o, pair, new_path,
2630
re, tree, o_tree,
2631
a_tree, b_tree,
2635
- entries,
2636
- clean_merge);
2632
+ entries);
2633
}
2634
2635
hashmap_iter_init(&collisions, &iter);
@@ -2944,8 +2940,8 @@ static int detect_and_process_renames(struct merge_options *o,
2940
merge_pairs = get_diffpairs(o, common, merge);
2941
2942
if (o->detect_directory_renames) {
2947
- dir_re_head = get_directory_renames(head_pairs, head);
2948
- dir_re_merge = get_directory_renames(merge_pairs, merge);
2943
+ dir_re_head = get_directory_renames(head_pairs);
2944
+ dir_re_merge = get_directory_renames(merge_pairs);
2945
2946
handle_directory_level_conflicts(o,
2947
dir_re_head, head,
@@ -3268,8 +3264,7 @@ static int process_entry(struct merge_options *o,
3264
clean_merge = 1;
3265
if (handle_rename_via_dir(o,
3266
conflict_info->pair1,
3271
- conflict_info->branch1,
3272
- conflict_info->branch2))
3267
+ conflict_info->branch1))
3268
clean_merge = -1;
3269
break;
3270
case RENAME_ADD: