summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-27 14:10:05 -0500
committerJunio C Hamano <gitster@pobox.com>2009-02-27 15:08:17 -0800
commit4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771 (patch)
treea7b57e74a60b3e240d4003f4e2752647c1e8baa7 /remote.c
parent7b3db095d53d19e08b27114d8706ff3be6693af7 (diff)
downloadgit-4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771.tar.gz
remote: let guess_remote_head() optionally return all matches
Determining HEAD is ambiguous since it is done by comparing SHA1s. In the case of multiple matches we return refs/heads/master if it matches, else we return the first match we encounter. builtin-remote needs all matches returned to it, so add a flag for it to request such. To be simple and consistent, the return value is now a copy (including peer_ref) of the matching refs. Originally contributed by Jeff King along with the prior 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.c29
1 files changed, 19 insertions, 10 deletions
diff --git a/remote.c b/remote.c
index 22203ea8e2..304e967e3c 100644
--- a/remote.c
+++ b/remote.c
@@ -1460,24 +1460,33 @@ struct ref *get_local_heads(void)
return local_refs;
}
-const struct ref *guess_remote_head(const struct ref *head,
- const struct ref *refs)
+struct ref *guess_remote_head(const struct ref *head,
+ const struct ref *refs,
+ int all)
{
const struct ref *r;
+ struct ref *list = NULL;
+ struct ref **tail = &list;
if (!head)
return NULL;
/* If refs/heads/master could be right, it is. */
- r = find_ref_by_name(refs, "refs/heads/master");
- if (r && !hashcmp(r->old_sha1, head->old_sha1))
- return r;
+ if (!all) {
+ r = find_ref_by_name(refs, "refs/heads/master");
+ if (r && !hashcmp(r->old_sha1, head->old_sha1))
+ return copy_ref(r);
+ }
/* Look for another ref that points there */
- for (r = refs; r; r = r->next)
- if (r != head && !hashcmp(r->old_sha1, head->old_sha1))
- return r;
+ for (r = refs; r; r = r->next) {
+ if (r != head && !hashcmp(r->old_sha1, head->old_sha1)) {
+ *tail = copy_ref(r);
+ tail = &((*tail)->next);
+ if (!all)
+ break;
+ }
+ }
- /* Nothing is the same */
- return NULL;
+ return list;
}