diff options
Diffstat (limited to 'remote.h')
| -rw-r--r-- | remote.h | 20 |
1 files changed, 18 insertions, 2 deletions
@@ -1,8 +1,15 @@ #ifndef REMOTE_H #define REMOTE_H +enum { + REMOTE_CONFIG, + REMOTE_REMOTES, + REMOTE_BRANCHES +}; + struct remote { const char *name; + int origin; const char **url; int url_nr; @@ -26,6 +33,7 @@ struct remote { */ int fetch_tags; int skip_default_update; + int mirror; const char *receivepack; const char *uploadpack; @@ -46,12 +54,15 @@ int remote_has_url(struct remote *remote, const char *url); struct refspec { unsigned force : 1; unsigned pattern : 1; + unsigned matching : 1; char *src; char *dst; }; -struct ref *alloc_ref(unsigned namelen); +extern const struct refspec *tag_refspec; + +struct ref *alloc_ref(const char *name); struct ref *copy_ref_list(const struct ref *ref); @@ -62,6 +73,8 @@ int check_ref_type(const struct ref *ref, int flags); */ void free_refs(struct ref *ref); +int resolve_remote_symref(struct ref *ref, struct ref *list); + /* * Removes and frees any duplicate refs in the map. */ @@ -69,7 +82,6 @@ void ref_remove_duplicates(struct ref *ref_map); int valid_fetch_refspec(const char *refspec); struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec); -struct refspec *parse_push_refspec(int nr_refspec, const char **refspec); int match_refs(struct ref *src, struct ref *dst, struct ref ***dst_tail, int nr_refspec, const char **refspec, int all); @@ -121,4 +133,8 @@ enum match_refs_flags { MATCH_REFS_MIRROR = (1 << 1), }; +/* Reporting of tracking info */ +int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs); +int format_tracking_info(struct branch *branch, struct strbuf *sb); + #endif |