diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2015-05-11 17:25:07 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-05-11 11:50:18 -0700 |
| commit | 8bfac19ab4844a63e2f660fcaf4fec4fbe08e47f (patch) | |
| tree | db7f0455898c99da9455be42a5521a290e288a09 | |
| parent | is_refname_available(): convert local variable "dirname" to strbuf (diff) | |
| download | tgif-8bfac19ab4844a63e2f660fcaf4fec4fbe08e47f.tar.xz | |
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.c | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -841,11 +841,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; @@ -855,7 +850,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; @@ -908,7 +903,7 @@ static int is_refname_available(const char *refname, * prefix of refname; e.g., "refs/foo". */ struct ref_entry *entry = dir->entries[pos]; - if (entry_matches(entry, skip)) { + if (skip && string_list_has_string(skip, entry->name)) { /* * The reference we just found, e.g., * "refs/foo", is also in skip, so it |