Merge branch 'jc/reflog-expire' into maint

diff --git a/remote.h b/remote.h
index 2ee83a33b3bb7ddaa5bb33493dacfbeca4ae5dbe..8eed87ba5ab78eb4635632c21843590467d0d864 100644 (file)
--- a/remote.h
+++ b/remote.h
@@ -47,11 +47,14 @@ 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);