From: Junio C Hamano Date: Thu, 7 Feb 2019 06:05:23 +0000 (-0800) Subject: Merge branch 'jk/unused-parameter-cleanup' X-Git-Tag: v2.21.0-rc0~22 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b2fc9d2fb02782a20d4370d7989be8b0a54f1017;p=git Merge branch 'jk/unused-parameter-cleanup' 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 --- b2fc9d2fb02782a20d4370d7989be8b0a54f1017 diff --cc match-trees.c index 18ab825bef,e65e665bf5..ddc4d39845 --- a/match-trees.c +++ b/match-trees.c @@@ -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,