Merge branch 'ds/branch-auto-rebase'

[git.git] / remote.h

diff --git a/remote.h b/remote.h
index 0f6033fb258c5a44971c7479e1dfe938393ce398..2ee83a33b3bb7ddaa5bb33493dacfbeca4ae5dbe 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -25,6 +25,8 @@ struct remote {
         * 2 to always fetch tags
         */
        int fetch_tags;
+       int skip_default_update;
+       int mirror;
 
        const char *receivepack;
        const char *uploadpack;
@@ -52,6 +54,8 @@ struct refspec {
 
 struct ref *alloc_ref(unsigned namelen);
 
+struct ref *alloc_ref_from_str(const char* str);
+
 struct ref *copy_ref_list(const struct ref *ref);
 
 int check_ref_type(const struct ref *ref, int flags);
@@ -61,12 +65,16 @@ 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.
  */
 void ref_remove_duplicates(struct ref *ref_map);
 
-struct refspec *parse_ref_spec(int nr_refspec, const char **refspec);
+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);