Merge branch 'maint'

diff --git a/remote.h b/remote.h
index a38774bbdc5acfb5ed9360ac92e1049fa79b26e1..75d006b6deb2ded726df2c1749aa63dec69e34d2 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -26,6 +26,7 @@ struct remote {
         */
        int fetch_tags;
        int skip_default_update;
+       int mirror;
 
        const char *receivepack;
        const char *uploadpack;
@@ -62,6 +63,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.
  */