Merge branch 'master' into js/shallow

[git.git] / pack.h

diff --git a/pack.h b/pack.h
index 9dafa2b6d2c76919594218b12a2a36bd9067f2b7..4814800f2806a245a675ea9832f894dc95b27b89 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -1,20 +1,7 @@
 #ifndef PACK_H
 #define PACK_H
 
-/*
- * The packed object type is stored in 3 bits.
- * The type value 0 is a reserved prefix if ever there is more than 7
- * object types, or any future format extensions.
- */
-enum object_type {
-       OBJ_EXT = 0,
-       OBJ_COMMIT = 1,
-       OBJ_TREE = 2,
-       OBJ_BLOB = 3,
-       OBJ_TAG = 4,
-       /* 5/6 for future expansion */
-       OBJ_DELTA = 7,
-};
+#include "object.h"
 
 /*
  * Packed object header
@@ -29,5 +16,4 @@ struct pack_header {
 };
 
 extern int verify_pack(struct packed_git *, int);
-
 #endif