Merge branch 'jc/reflog-expire' into maint

diff --git a/remote.h b/remote.h
index 6878c52ce0e3fa57693e919a9cdb66748bb6e6e3..8eed87ba5ab78eb4635632c21843590467d0d864 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -47,13 +47,18 @@ 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;
 };
 
+extern const struct refspec *tag_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);
@@ -63,6 +68,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.
  */