summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-25 08:32:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-26 08:49:45 (GMT)
commit6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800 (patch)
treec6fd93a97080cd6c5e4c1b171b577e584ab3759d /remote.h
parent8ef517337dc684a333111b46d88c3217202f48c3 (diff)
downloadgit-6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800.zip
git-6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800.tar.gz
git-6cb4e6cc0f5b2de1998492b0178eeb0f99d4a800.tar.bz2
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.h')
-rw-r--r--remote.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/remote.h b/remote.h
index 9605da9..db49ce0 100644
--- a/remote.h
+++ b/remote.h
@@ -139,13 +139,12 @@ 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 in refs for HEAD. Then look for a matching SHA1 in mapped_refs,
- * first checking if refs/heads/master matches. Return NULL if nothing matches
- * or if there is no HEAD in refs. remote_head_p is assigned HEAD if not NULL.
+ * 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.
*/
-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);
#endif