Merge branch 'pb/config' into next

* pb/config:
  Support for extracting configuration from different files
  Fix PPC SHA1 routine for large input buffers
  Make t8001-annotate and t8002-blame more portable
  Remove "refs" field from "struct object"
  Make release tarballs friendlier to older tar versions

1 files changed, 3 insertions, 1 deletions

diff --git a/object.h b/object.h
index f4ee2e55ba..c537b4b72a 100644
--- a/object.h
+++ b/object.h
@@ -9,6 +9,7 @@ struct object_list {
 
 struct object_refs {
 	unsigned count;
+	struct object *base;
 	struct object *ref[FLEX_ARRAY]; /* more */
 };
 
@@ -28,7 +29,6 @@ struct object {
 	unsigned type : TYPE_BITS;
 	unsigned flags : FLAG_BITS;
 	unsigned char sha1[20];
-	struct object_refs *refs;
 };
 
 extern int track_object_refs;
@@ -41,6 +41,8 @@ static inline const char *typename(unsigned int type)
 	return type_names[type > TYPE_TAG ? TYPE_BAD : type];
 }
 
+extern struct object_refs *lookup_object_refs(struct object *);
+
 /** Internal only **/
 struct object *lookup_object(const unsigned char *sha1);