Merge branch 'rs/tar-tree' into next

diff --git a/tag.h b/tag.h
index 3e8c32d738ddad2538257b84830424a77b9aae7a..7a0cb0070d46ba8c49d71029dc0704188805ea62 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -15,5 +15,6 @@ struct tag {
 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 */