Merge branch 'rs/tar-tree' into next

diff --git a/tag.h b/tag.h
index eddfed6bf3b1cae1458b6ee9232d6c5ea12aad35..7a0cb0070d46ba8c49d71029dc0704188805ea62 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -12,7 +12,9 @@ struct tag {
        char *signature; /* not actually implemented */
 };
 
-extern struct tag *lookup_tag(unsigned char *sha1);
+extern struct tag *lookup_tag(const unsigned char *sha1);
+extern int parse_tag_buffer(struct tag *item, void *data, unsigned long size);
 extern int parse_tag(struct tag *item);
+extern struct object *deref_tag(struct object *, const char *, int);
 
 #endif /* TAG_H */