summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-27 19:10:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-27 23:08:17 (GMT)
commit4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771 (patch)
treea7b57e74a60b3e240d4003f4e2752647c1e8baa7 /remote.h
parent7b3db095d53d19e08b27114d8706ff3be6693af7 (diff)
downloadgit-4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771.zip
git-4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771.tar.gz
git-4229f1fa325870d6b24fe2a4c7d2ed5f14c6f771.tar.bz2
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.h')
-rw-r--r--remote.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/remote.h b/remote.h
index db49ce0..de3d21b 100644
--- a/remote.h
+++ b/remote.h
@@ -139,12 +139,14 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs);
int format_tracking_info(struct branch *branch, struct strbuf *sb);
struct ref *get_local_heads(void);
-
/*
- * Look for a ref in refs whose SHA1 matches head, first checking if
- * refs/heads/master matches. Return NULL if nothing matches or if head
- * is NULL.
+ * Find refs from a list which are likely to be pointed to by the given HEAD
+ * ref. If 'all' is false, returns the most likely ref; otherwise, returns a
+ * list of all candidate refs. If no match is found (or 'head' is NULL),
+ * returns NULL. All returns are newly allocated and should be freed.
*/
-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);
+
#endif