kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

filter_refs(): simplify logic 

Simplify flow within loop: first decide whether to keep the reference,
then keep/free it.  This makes it clearer that each ref has exactly
two possible destinies, and removes duplication of the code for
appending the reference to the linked list.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2012-09-09 08:19:45 +02:00 committed by Junio C Hamano
parent 5096e48753
commit f537cfa750
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
builtin/fetch-pack.c
View File

@ -544,37 +544,36 @@ static void filter_refs(struct ref **refs, struct string_list *sought)


sought_pos = 0; sought_pos = 0;
for (ref = *refs; ref; ref = next) { for (ref = *refs; ref; ref = next) {
int keep = 0;
next = ref->next; next = ref->next;
if (!memcmp(ref->name, "refs/", 5) && if (!memcmp(ref->name, "refs/", 5) &&
check_refname_format(ref->name + 5, 0)) check_refname_format(ref->name + 5, 0))
; /* trash */ ; /* trash */
else if (args.fetch_all && else if (args.fetch_all &&
(!args.depth || prefixcmp(ref->name, "refs/tags/") )) { (!args.depth || prefixcmp(ref->name, "refs/tags/")))
keep = 1;
else {
while (sought_pos < sought->nr) {
int cmp = strcmp(ref->name, sought->items[sought_pos].string);
if (cmp < 0)
break; /* definitely do not have it */
else if (cmp == 0) {
keep = 1; /* definitely have it */
sought->items[sought_pos++].util = "matched";
break;
}
else
sought_pos++; /* might have it; keep looking */
}
}

if (keep) {
*newtail = ref; *newtail = ref;
ref->next = NULL; ref->next = NULL;
newtail = &ref->next; newtail = &ref->next;
continue; } else {
free(ref);
} }
else {
int cmp = -1;
while (sought_pos < sought->nr) {
cmp = strcmp(ref->name, sought->items[sought_pos].string);
if (cmp < 0) /* definitely do not have it */
break;
else if (cmp == 0) { /* definitely have it */
sought->items[sought_pos++].util = "matched";
*newtail = ref;
ref->next = NULL;
newtail = &ref->next;
break;
}
else /* might have it; keep looking */
sought_pos++;
}
if (!cmp)
continue; /* we will link it later */
}
free(ref);
} }


if (!args.fetch_all) if (!args.fetch_all)