git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/pack.h b/pack.h
index 08e120dca664f43f8c12a2ce59cb28a67315500a..eb07b033ae54941d4bd00ee6bc30c7d50fd039b0 100644 (file)
--- a/pack.h
+++ b/pack.h
@@ -1,23 +1,22 @@
 #ifndef PACK_H
 #define PACK_H
 
-enum object_type {
-       OBJ_NONE,
-       OBJ_COMMIT,
-       OBJ_TREE,
-       OBJ_BLOB,
-       OBJ_TAG,
-       OBJ_DELTA,
-};
+#include "object.h"
 
 /*
  * Packed object header
  */
 #define PACK_SIGNATURE 0x5041434b      /* "PACK" */
+#define PACK_VERSION 2
+#define pack_version_ok(v) ((v) == htonl(2) || (v) == htonl(3))
 struct pack_header {
        unsigned int hdr_signature;
        unsigned int hdr_version;
        unsigned int hdr_entries;
 };
 
+extern int verify_pack(struct packed_git *, int);
+extern int check_reuse_pack_delta(struct packed_git *, unsigned long,
+                                 unsigned char *, unsigned long *,
+                                 enum object_type *);
 #endif