X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=c9fa3df7f5b343ecea980ceb423e7c23d2eb22b2;hb=302ad7a9930a34413418b6436f96826070367647;hp=ff4a7c26d3b4dc6c9b28d8a28919b11fd71443bb;hpb=a278aa61a474eced7b676f3378dcd0f4ec5db4fc;p=git.git

diff --git a/cache.h b/cache.h
index ff4a7c26d..c9fa3df7f 100644
--- a/cache.h
+++ b/cache.h
@@ -750,12 +750,23 @@ static inline unsigned int hexval(unsigned char c)
 #define MINIMUM_ABBREV 4
 #define DEFAULT_ABBREV 7
 
+struct object_context {
+	unsigned char tree[20];
+	char path[PATH_MAX];
+	unsigned mode;
+};
+
 extern int get_sha1(const char *str, unsigned char *sha1);
 extern int get_sha1_with_mode_1(const char *str, unsigned char *sha1, unsigned *mode, int gently, const char *prefix);
 static inline int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)
 {
 	return get_sha1_with_mode_1(str, sha1, mode, 1, NULL);
 }
+extern int get_sha1_with_context_1(const char *name, unsigned char *sha1, struct object_context *orc, int gently, const char *prefix);
+static inline int get_sha1_with_context(const char *str, unsigned char *sha1, struct object_context *orc)
+{
+	return get_sha1_with_context_1(str, sha1, orc, 1, NULL);
+}
 extern int get_sha1_hex(const char *hex, unsigned char *sha1);
 extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */
 extern int read_ref(const char *filename, unsigned char *sha1);