Merge branch 'jk/unused-parameter-cleanup'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:23 +0000 (22:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Feb 2019 06:05:23 +0000 (22:05 -0800)
Code cleanup.

* jk/unused-parameter-cleanup:
convert: drop path parameter from actual conversion functions
convert: drop len parameter from conversion checks
config: drop unused parameter from maybe_remove_section()
show_date_relative(): drop unused "tz" parameter
column: drop unused "opts" parameter in item_length()
create_bundle(): drop unused "header" parameter
apply: drop unused "def" parameter from find_name_gnu()
match-trees: drop unused path parameter from score functions

1  2 
apply.c
cache.h
convert.c
match-trees.c
diff --cc apply.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc convert.c
Simple merge
diff --cc match-trees.c
index 18ab825bef57f3ea63f70adf9a5c4e4a4f000bc4,e65e665bf526c5169a734ee6bbd9a4013c9bc059..ddc4d398456363cede9f3f5d4fa602efb402b5bd
@@@ -106,11 -106,10 +106,10 @@@ static int score_trees(const struct obj
                        update_tree_entry(&two);
                } else {
                        /* path appears in both */
 -                      if (!oideq(one.entry.oid, two.entry.oid)) {
 +                      if (!oideq(&one.entry.oid, &two.entry.oid)) {
                                /* they are different */
                                score += score_differs(one.entry.mode,
-                                                      two.entry.mode,
-                                                      one.entry.path);
+                                                      two.entry.mode);
                        } else {
                                /* same subtree or blob */
                                score += score_matches(one.entry.mode,