From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 1/8] match-trees: drop unused path parameter from score functions
Date: Thu, 24 Jan 2019 08:11:34 -0500 [thread overview]
Message-ID: <20190124131133.GA22398@sigill.intra.peff.net> (raw)
In-Reply-To: <20190124131104.GA24017@sigill.intra.peff.net>
The scores do not take the particular path into account at
all. It's possible they could, but these are all static file-local
functions. It won't be a big deal to re-add the parameter if they ever
need it.
Signed-off-by: Jeff King <peff@peff.net>
---
match-trees.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/match-trees.c b/match-trees.c
index 2b6d31ef9d..e65e665bf5 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -3,7 +3,7 @@
#include "tree-walk.h"
#include "object-store.h"
-static int score_missing(unsigned mode, const char *path)
+static int score_missing(unsigned mode)
{
int score;
@@ -16,7 +16,7 @@ static int score_missing(unsigned mode, const char *path)
return score;
}
-static int score_differs(unsigned mode1, unsigned mode2, const char *path)
+static int score_differs(unsigned mode1, unsigned mode2)
{
int score;
@@ -29,7 +29,7 @@ static int score_differs(unsigned mode1, unsigned mode2, const char *path)
return score;
}
-static int score_matches(unsigned mode1, unsigned mode2, const char *path)
+static int score_matches(unsigned mode1, unsigned mode2)
{
int score;
@@ -98,24 +98,22 @@ static int score_trees(const struct object_id *hash1, const struct object_id *ha
if (cmp < 0) {
/* path1 does not appear in two */
- score += score_missing(one.entry.mode, one.entry.path);
+ score += score_missing(one.entry.mode);
update_tree_entry(&one);
} else if (cmp > 0) {
/* path2 does not appear in one */
- score += score_missing(two.entry.mode, two.entry.path);
+ score += score_missing(two.entry.mode);
update_tree_entry(&two);
} else {
/* path appears in both */
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,
- two.entry.mode,
- one.entry.path);
+ two.entry.mode);
}
update_tree_entry(&one);
update_tree_entry(&two);
--
2.20.1.842.g8986705066
next prev parent reply other threads:[~2019-01-24 13:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 13:11 [PATCH 0/9] drop some unused parameters Jeff King
2019-01-24 13:11 ` Jeff King [this message]
2019-01-24 13:11 ` [PATCH 2/8] apply: drop unused "def" parameter from find_name_gnu() Jeff King
2019-01-24 13:11 ` [PATCH 3/8] create_bundle(): drop unused "header" parameter Jeff King
2019-01-24 13:11 ` [PATCH 4/8] column: drop unused "opts" parameter in item_length() Jeff King
2019-01-24 13:12 ` [PATCH 5/8] show_date_relative(): drop unused "tz" parameter Jeff King
2019-01-24 14:07 ` Derrick Stolee
2019-01-24 13:12 ` [PATCH 6/8] config: drop unused parameter from maybe_remove_section() Jeff King
2019-01-24 13:12 ` [PATCH 7/8] convert: drop len parameter from conversion checks Jeff King
2019-01-24 13:12 ` [PATCH 8/8] convert: drop path parameter from actual conversion functions Jeff King
2019-01-24 14:09 ` [PATCH 0/9] drop some unused parameters Derrick Stolee
2019-01-24 20:35 ` Junio C Hamano
2019-01-25 1:53 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124131133.GA22398@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).