summaryrefslogtreecommitdiff
path: root/remote.h
diff options
context:
space:
mode:
authorJay Soffian <jaysoffian@gmail.com>2009-02-25 08:32:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-26 08:49:45 (GMT)
commit8ef517337dc684a333111b46d88c3217202f48c3 (patch)
tree98b33a4470f5a7ff3196b8e644c8beae614ee3fd /remote.h
parentec8452d5a797fca865666f761b785b04212426fc (diff)
downloadgit-8ef517337dc684a333111b46d88c3217202f48c3.zip
git-8ef517337dc684a333111b46d88c3217202f48c3.tar.gz
git-8ef517337dc684a333111b46d88c3217202f48c3.tar.bz2
move locate_head() to remote.c
Move locate_head() to remote.c and rename it to guess_remote_head() to more accurately reflect what it does. This is in preparation for being able to call it from builtin-remote.c 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.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/remote.h b/remote.h
index c0666a0..9605da9 100644
--- a/remote.h
+++ b/remote.h
@@ -139,4 +139,13 @@ 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.
+ */
+const struct ref *guess_remote_head(const struct ref *refs,
+ const struct ref *mapped_refs,
+ const struct ref **remote_head_p);
+
#endif