summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Haggerty <mhagger@alum.mit.edu>2015-05-01 14:25:45 +0200
committerJunio C Hamano <gitster@pobox.com>2015-05-10 11:31:32 -0700
commit363431a54dd59d759a3e802e1b9099057f23f7f3 (patch)
tree6f688f3ad576a3ea0f6a491666409f725ac7ff06
parent68ff34b31c7a63b025a9e687b3680ad9e4101497 (diff)
downloadgit-363431a54dd59d759a3e802e1b9099057f23f7f3.tar.gz
entry_matches(): inline function
It wasn't pulling its weight. And in a moment we will need similar tests that take a refname rather than a ref_entry as parameter, which would have made entry_matches() even less useful. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
-rw-r--r--refs.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/refs.c b/refs.c
index 4924b203be..4609ed15eb 100644
--- a/refs.c
+++ b/refs.c
@@ -847,11 +847,6 @@ static void prime_ref_dir(struct ref_dir *dir)
}
}
-static int entry_matches(struct ref_entry *entry, const struct string_list *list)
-{
- return list && string_list_has_string(list, entry->name);
-}
-
struct nonmatching_ref_data {
const struct string_list *skip;
struct ref_entry *found;
@@ -861,7 +856,7 @@ static int nonmatching_ref_fn(struct ref_entry *entry, void *vdata)
{
struct nonmatching_ref_data *data = vdata;
- if (entry_matches(entry, data->skip))
+ if (data->skip && string_list_has_string(data->skip, entry->name))
return 0;
data->found = entry;
@@ -907,7 +902,7 @@ static int is_refname_available(const char *refname,
pos = search_ref_dir(dir, refname, slash - refname);
if (pos >= 0) {
struct ref_entry *entry = dir->entries[pos];
- if (entry_matches(entry, skip)) {
+ if (skip && string_list_has_string(skip, entry->name)) {
/*
* The fact that entry is a ref whose
* name is a prefix of refname means