X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=cache.h;h=bdbe2d683e18237e2a797573e45b9c38383eaf04;hb=ec0bdb6f1e8fd772ff9eb920ebcb7dd1afcaf362;hp=b493b65b74d31aa146ac3af80c5cd24967bce816;hpb=0bdd79af62e8621359af08f0afca0ce977348ac7;p=git.git

diff --git a/cache.h b/cache.h
index b493b65b..bdbe2d68 100644
--- a/cache.h
+++ b/cache.h
@@ -209,9 +209,6 @@ extern char *write_sha1_file_prepare(void *buf,
 
 extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
 
-/* Read a tree into the cache */
-extern int read_tree(void *buffer, unsigned long size, int stage, const char **paths);
-
 extern int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
 			      size_t bufsize, size_t *bufposn);
 extern int write_sha1_to_fd(int fd, const unsigned char *sha1);
@@ -224,6 +221,9 @@ extern int has_pack_file(const unsigned char *sha1);
 extern int has_pack_index(const unsigned char *sha1);
 
 /* Convert to/from hex/sha1 representation */
+#define MINIMUM_ABBREV 4
+#define DEFAULT_ABBREV 7
+
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
 extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */