From: Felipe Contreras Date: Tue, 4 Jun 2019 02:13:28 +0000 (-0500) Subject: fetch: trivial cleanup X-Git-Tag: v2.23.0-rc0~93^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8363b57193ea3e881367ff06035d4a2fe021d59;p=thirdparty%2Fgit.git fetch: trivial cleanup Create a helper function to clear an item. The way items are cleared has changed, and will change again soon. No functional changes. Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/builtin/fetch.c b/builtin/fetch.c index aee1d9bf21..547b25d206 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -285,6 +285,11 @@ static int refname_hash_exists(struct hashmap *map, const char *refname) return !!hashmap_get_from_hash(map, strhash(refname), refname); } +static void clear_item(struct refname_hash_entry *item) +{ + oidclr(&item->oid); +} + static void find_non_local_tags(const struct ref *refs, struct ref **head, struct ref ***tail) @@ -318,7 +323,7 @@ static void find_non_local_tags(const struct ref *refs, !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) - oidclr(&item->oid); + clear_item(item); item = NULL; continue; } @@ -332,7 +337,7 @@ static void find_non_local_tags(const struct ref *refs, if (item && !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) - oidclr(&item->oid); + clear_item(item); item = NULL; @@ -353,7 +358,7 @@ static void find_non_local_tags(const struct ref *refs, if (item && !has_sha1_file_with_flags(item->oid.hash, OBJECT_INFO_QUICK) && !will_fetch(head, item->oid.hash)) - oidclr(&item->oid); + clear_item(item); /* * For all the tags in the remote_refs_list,