aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2013-04-13 15:28:30 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-17 09:49:11 -0700
commit29fb37b272debaf4f5f6eb7cf476de9274492930 (patch)
treeed6827f948d726bec9fadb0b0f292146e27a28a6 /cache.h
parent04a74b6cfa5ef4870263f84ac94a488d9f2ef14a (diff)
downloadgit-29fb37b272debaf4f5f6eb7cf476de9274492930.tar.gz
git-29fb37b272debaf4f5f6eb7cf476de9274492930.tar.xz
attr.c: extract read_index_data() as read_blob_data_from_index()
Extract the read_index_data() function from attr.c and move it to read-cache.c; rename it to read_blob_data_from_index() and update the function signature of it to align better with index/cache API functions. This allows for reusing the function in convert.c later. Signed-off-by: Lukas Fleischer <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 3622e1841..5d66c74f6 100644
--- a/cache.h
+++ b/cache.h
@@ -307,6 +307,7 @@ extern void free_name_hash(struct index_state *istate);
#define resolve_undo_clear() resolve_undo_clear_index(&the_index)
#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
#define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)
+#define read_blob_data_from_cache(path) read_blob_data_from_index(&the_index, (path))
#endif
enum object_type {
@@ -452,6 +453,7 @@ extern int add_file_to_index(struct index_state *, const char *path, int flags);
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
extern int index_name_is_other(const struct index_state *, const char *, int);
+extern void *read_blob_data_from_index(struct index_state *, const char *);
/* do stat comparison even if CE_VALID is true */
#define CE_MATCH_IGNORE_VALID 01