Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git

diff --git a/packfile.h b/packfile.h
index a0a3c08ff2bb5b4b216f70043b3980212c405a84..0cdeb54dcd97a67c38285e8f81412ec71273fd7f 100644 (file)
--- a/packfile.h
+++ b/packfile.h
@@ -120,4 +120,19 @@ extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
 
 extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
 
+extern int has_sha1_pack(const unsigned char *sha1);
+
+extern int has_pack_index(const unsigned char *sha1);
+
+/*
+ * Iterate over packed objects in both the local
+ * repository and any alternates repositories (unless the
+ * FOR_EACH_OBJECT_LOCAL_ONLY flag, defined in cache.h, is set).
+ */
+typedef int each_packed_object_fn(const struct object_id *oid,
+                                 struct packed_git *pack,
+                                 uint32_t pos,
+                                 void *data);
+extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
+
 #endif