Merge branch 'jc/index-extended-flags'

* jc/index-extended-flags:
index: future proof for "extended" index entries

diff --combined cache.h
index 68ce6e686fb83265a0f151944182b0ba10647626,7b5cc834ab5df95a9589fa83e0236806b9c77097..928ae9f148dae6361b6300aea9e76f22e0c23e60
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -126,6 -126,7 +126,7 @@@ struct cache_entry 
  
  #define CE_NAMEMASK  (0x0fff)
  #define CE_STAGEMASK (0x3000)
+ #define CE_EXTENDED  (0x4000)
  #define CE_VALID     (0x8000)
  #define CE_STAGESHIFT 12
  
@@@ -391,6 -392,7 +392,6 @@@ extern int ie_modified(const struct ind
  
  extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
  extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
 -extern int index_pipe(unsigned char *sha1, int fd, const char *type, int write_object);
  extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
  extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);