diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:39:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:39:45 -0700 |
| commit | 4b35b007a6bd8b76bd37589fa397c12265935029 (patch) | |
| tree | 23b3c8432d49afea63efdedeab721b753a5e1eda /cache.h | |
| parent | d2949c7b3c8a2f0d2cb5c61d99017a1a85a46264 (diff) | |
| parent | 4982fd78f61db69504f91151f94fce9914d610b6 (diff) | |
| download | git-4b35b007a6bd8b76bd37589fa397c12265935029.tar.gz | |
Merge branch 'lf/read-blob-data-from-index'
Reduce duplicated code between convert.c and attr.c.
* lf/read-blob-data-from-index:
convert.c: remove duplicate code
read_blob_data_from_index(): optionally return the size of blob data
attr.c: extract read_index_data() as read_blob_data_from_index()
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -311,6 +311,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, sz) read_blob_data_from_index(&the_index, (path), (sz)) #endif enum object_type { @@ -471,6 +472,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 *, unsigned long *); /* do stat comparison even if CE_VALID is true */ #define CE_MATCH_IGNORE_VALID 01 |