builtin/fetch.c: reorder function definitions
Reorder function definitions to avoid the need for a forward declaration of function find_non_local_tags(). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
Junio C Hamano
parent
f137a45e0d
commit
a0fbb5a329
198
builtin/fetch.c
198
builtin/fetch.c
@ -160,9 +160,105 @@ static void add_merge_config(struct ref **head,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int add_existing(const char *refname, const unsigned char *sha1,
|
||||||
|
int flag, void *cbdata)
|
||||||
|
{
|
||||||
|
struct string_list *list = (struct string_list *)cbdata;
|
||||||
|
struct string_list_item *item = string_list_insert(list, refname);
|
||||||
|
item->util = xmalloc(20);
|
||||||
|
hashcpy(item->util, sha1);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int will_fetch(struct ref **head, const unsigned char *sha1)
|
||||||
|
{
|
||||||
|
struct ref *rm = *head;
|
||||||
|
while (rm) {
|
||||||
|
if (!hashcmp(rm->old_sha1, sha1))
|
||||||
|
return 1;
|
||||||
|
rm = rm->next;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static void find_non_local_tags(struct transport *transport,
|
static void find_non_local_tags(struct transport *transport,
|
||||||
struct ref **head,
|
struct ref **head,
|
||||||
struct ref ***tail);
|
struct ref ***tail)
|
||||||
|
{
|
||||||
|
struct string_list existing_refs = STRING_LIST_INIT_DUP;
|
||||||
|
struct string_list remote_refs = STRING_LIST_INIT_NODUP;
|
||||||
|
const struct ref *ref;
|
||||||
|
struct string_list_item *item = NULL;
|
||||||
|
|
||||||
|
for_each_ref(add_existing, &existing_refs);
|
||||||
|
for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
|
||||||
|
if (prefixcmp(ref->name, "refs/tags/"))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* The peeled ref always follows the matching base
|
||||||
|
* ref, so if we see a peeled ref that we don't want
|
||||||
|
* to fetch then we can mark the ref entry in the list
|
||||||
|
* as one to ignore by setting util to NULL.
|
||||||
|
*/
|
||||||
|
if (!suffixcmp(ref->name, "^{}")) {
|
||||||
|
if (item && !has_sha1_file(ref->old_sha1) &&
|
||||||
|
!will_fetch(head, ref->old_sha1) &&
|
||||||
|
!has_sha1_file(item->util) &&
|
||||||
|
!will_fetch(head, item->util))
|
||||||
|
item->util = NULL;
|
||||||
|
item = NULL;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If item is non-NULL here, then we previously saw a
|
||||||
|
* ref not followed by a peeled reference, so we need
|
||||||
|
* to check if it is a lightweight tag that we want to
|
||||||
|
* fetch.
|
||||||
|
*/
|
||||||
|
if (item && !has_sha1_file(item->util) &&
|
||||||
|
!will_fetch(head, item->util))
|
||||||
|
item->util = NULL;
|
||||||
|
|
||||||
|
item = NULL;
|
||||||
|
|
||||||
|
/* skip duplicates and refs that we already have */
|
||||||
|
if (string_list_has_string(&remote_refs, ref->name) ||
|
||||||
|
string_list_has_string(&existing_refs, ref->name))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
item = string_list_insert(&remote_refs, ref->name);
|
||||||
|
item->util = (void *)ref->old_sha1;
|
||||||
|
}
|
||||||
|
string_list_clear(&existing_refs, 1);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We may have a final lightweight tag that needs to be
|
||||||
|
* checked to see if it needs fetching.
|
||||||
|
*/
|
||||||
|
if (item && !has_sha1_file(item->util) &&
|
||||||
|
!will_fetch(head, item->util))
|
||||||
|
item->util = NULL;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For all the tags in the remote_refs string list,
|
||||||
|
* add them to the list of refs to be fetched
|
||||||
|
*/
|
||||||
|
for_each_string_list_item(item, &remote_refs) {
|
||||||
|
/* Unless we have already decided to ignore this item... */
|
||||||
|
if (item->util)
|
||||||
|
{
|
||||||
|
struct ref *rm = alloc_ref(item->string);
|
||||||
|
rm->peer_ref = alloc_ref(item->string);
|
||||||
|
hashcpy(rm->old_sha1, item->util);
|
||||||
|
**tail = rm;
|
||||||
|
*tail = &rm->next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
string_list_clear(&remote_refs, 0);
|
||||||
|
}
|
||||||
|
|
||||||
static struct ref *get_ref_map(struct transport *transport,
|
static struct ref *get_ref_map(struct transport *transport,
|
||||||
struct refspec *refspecs, int refspec_count,
|
struct refspec *refspecs, int refspec_count,
|
||||||
@ -612,106 +708,6 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map)
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int add_existing(const char *refname, const unsigned char *sha1,
|
|
||||||
int flag, void *cbdata)
|
|
||||||
{
|
|
||||||
struct string_list *list = (struct string_list *)cbdata;
|
|
||||||
struct string_list_item *item = string_list_insert(list, refname);
|
|
||||||
item->util = xmalloc(20);
|
|
||||||
hashcpy(item->util, sha1);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int will_fetch(struct ref **head, const unsigned char *sha1)
|
|
||||||
{
|
|
||||||
struct ref *rm = *head;
|
|
||||||
while (rm) {
|
|
||||||
if (!hashcmp(rm->old_sha1, sha1))
|
|
||||||
return 1;
|
|
||||||
rm = rm->next;
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void find_non_local_tags(struct transport *transport,
|
|
||||||
struct ref **head,
|
|
||||||
struct ref ***tail)
|
|
||||||
{
|
|
||||||
struct string_list existing_refs = STRING_LIST_INIT_DUP;
|
|
||||||
struct string_list remote_refs = STRING_LIST_INIT_NODUP;
|
|
||||||
const struct ref *ref;
|
|
||||||
struct string_list_item *item = NULL;
|
|
||||||
|
|
||||||
for_each_ref(add_existing, &existing_refs);
|
|
||||||
for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
|
|
||||||
if (prefixcmp(ref->name, "refs/tags/"))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The peeled ref always follows the matching base
|
|
||||||
* ref, so if we see a peeled ref that we don't want
|
|
||||||
* to fetch then we can mark the ref entry in the list
|
|
||||||
* as one to ignore by setting util to NULL.
|
|
||||||
*/
|
|
||||||
if (!suffixcmp(ref->name, "^{}")) {
|
|
||||||
if (item && !has_sha1_file(ref->old_sha1) &&
|
|
||||||
!will_fetch(head, ref->old_sha1) &&
|
|
||||||
!has_sha1_file(item->util) &&
|
|
||||||
!will_fetch(head, item->util))
|
|
||||||
item->util = NULL;
|
|
||||||
item = NULL;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* If item is non-NULL here, then we previously saw a
|
|
||||||
* ref not followed by a peeled reference, so we need
|
|
||||||
* to check if it is a lightweight tag that we want to
|
|
||||||
* fetch.
|
|
||||||
*/
|
|
||||||
if (item && !has_sha1_file(item->util) &&
|
|
||||||
!will_fetch(head, item->util))
|
|
||||||
item->util = NULL;
|
|
||||||
|
|
||||||
item = NULL;
|
|
||||||
|
|
||||||
/* skip duplicates and refs that we already have */
|
|
||||||
if (string_list_has_string(&remote_refs, ref->name) ||
|
|
||||||
string_list_has_string(&existing_refs, ref->name))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
item = string_list_insert(&remote_refs, ref->name);
|
|
||||||
item->util = (void *)ref->old_sha1;
|
|
||||||
}
|
|
||||||
string_list_clear(&existing_refs, 1);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We may have a final lightweight tag that needs to be
|
|
||||||
* checked to see if it needs fetching.
|
|
||||||
*/
|
|
||||||
if (item && !has_sha1_file(item->util) &&
|
|
||||||
!will_fetch(head, item->util))
|
|
||||||
item->util = NULL;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* For all the tags in the remote_refs string list,
|
|
||||||
* add them to the list of refs to be fetched
|
|
||||||
*/
|
|
||||||
for_each_string_list_item(item, &remote_refs) {
|
|
||||||
/* Unless we have already decided to ignore this item... */
|
|
||||||
if (item->util)
|
|
||||||
{
|
|
||||||
struct ref *rm = alloc_ref(item->string);
|
|
||||||
rm->peer_ref = alloc_ref(item->string);
|
|
||||||
hashcpy(rm->old_sha1, item->util);
|
|
||||||
**tail = rm;
|
|
||||||
*tail = &rm->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
string_list_clear(&remote_refs, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void check_not_current_branch(struct ref *ref_map)
|
static void check_not_current_branch(struct ref *ref_map)
|
||||||
{
|
{
|
||||||
struct branch *current_branch = branch_get(NULL);
|
struct branch *current_branch = branch_get(NULL);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user