summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-25 03:32:14 -0500
committerJunio C Hamano <gitster@pobox.com>2009-02-26 00:49:45 -0800
commit6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800 (patch)
treec6fd93a97080cd6c5e4c1b171b577e584ab3759d /remote.c
parent8ef517337dc684a333111b46d88c3217202f48c3 (diff)
downloadgit-6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800.tar.gz
remote: simplify guess_remote_head()
This function had complications which made it hard to extend. - It used to do two things: find the HEAD ref, and then find a matching ref, optionally returning the former via assignment to a passed-in pointer. Since finding HEAD is a one-liner, just have a caller do it themselves and pass it as an argument. - It used to manually search through the ref list for refs/heads/master; this can be a one-line call to find_ref_by_name. Originally contributed by Jeff King along with the next commit as a single patch. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c31
1 files changed, 8 insertions, 23 deletions
diff --git a/remote.c b/remote.c
index 49a183eb5a..aed760ee3a 100644
--- a/remote.c
+++ b/remote.c
@@ -1452,37 +1452,22 @@ struct ref *get_local_heads(void)
return local_refs;
}
-const struct ref *guess_remote_head(const struct ref *refs,
- const struct ref *mapped_refs,
- const struct ref **remote_head_p)
+const struct ref *guess_remote_head(const struct ref *head,
+ const struct ref *refs)
{
- const struct ref *remote_head = NULL;
- const struct ref *remote_master = NULL;
const struct ref *r;
- for (r = refs; r; r = r->next)
- if (!strcmp(r->name, "HEAD"))
- remote_head = r;
-
- for (r = mapped_refs; r; r = r->next)
- if (!strcmp(r->name, "refs/heads/master"))
- remote_master = r;
- if (remote_head_p)
- *remote_head_p = remote_head;
-
- /* If there's no HEAD value at all, never mind. */
- if (!remote_head)
+ if (!head)
return NULL;
/* If refs/heads/master could be right, it is. */
- if (remote_master && !hashcmp(remote_master->old_sha1,
- remote_head->old_sha1))
- return remote_master;
+ r = find_ref_by_name(refs, "refs/heads/master");
+ if (r && !hashcmp(r->old_sha1, head->old_sha1))
+ return r;
/* Look for another ref that points there */
- for (r = mapped_refs; r; r = r->next)
- if (r != remote_head &&
- !hashcmp(r->old_sha1, remote_head->old_sha1))
+ for (r = refs; r; r = r->next)
+ if (r != head && !hashcmp(r->old_sha1, head->old_sha1))
return r;
/* Nothing is the same */