diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-11-12 15:03:57 -0800 |
commit | 6cd3729eae8d8945c0482423149163d40afd082c (patch) | |
tree | 5a41d37b2d0c5f1ba62ebb6d42901ffe4b26a796 /cache.h | |
parent | 2baf1850ceb01dfbee862e30f2a69cf6064e13eb (diff) | |
parent | c14639f7b14d3d856c7c1f6c097dd1cb9615a5d0 (diff) | |
download | git-6cd3729eae8d8945c0482423149163d40afd082c.tar.gz git-6cd3729eae8d8945c0482423149163d40afd082c.tar.xz |
Merge branch 'maint'
* maint:
Start 1.6.0.5 cycle
Fix pack.packSizeLimit and --max-pack-size handling
checkout: Fix "initial checkout" detection
Remove the period after the git-check-attr summary
Conflicts:
RelNotes
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -262,6 +262,7 @@ static inline void remove_name_hash(struct cache_entry *ce) #define read_cache() read_index(&the_index) #define read_cache_from(path) read_index_from(&the_index, (path)) +#define is_cache_unborn() is_index_unborn(&the_index) #define read_cache_unmerged() read_index_unmerged(&the_index) #define write_cache(newfd, cache, entries) write_index(&the_index, (newfd)) #define discard_cache() discard_index(&the_index) @@ -368,6 +369,7 @@ extern int init_db(const char *template_dir, unsigned int flags); /* Initialize and use the cache information */ extern int read_index(struct index_state *); extern int read_index_from(struct index_state *, const char *path); +extern int is_index_unborn(struct index_state *); extern int read_index_unmerged(struct index_state *); extern int write_index(const struct index_state *, int newfd); extern int discard_index(struct index_state *); |