From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Aug 2008 06:41:47 +0000 (-0700)
Subject: Merge branch 'jc/index-extended-flags'
X-Git-Tag: v1.6.1-rc1~333
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0a8eb7bae5101a3c1f550d67f1d4c0879dd417da?ds=inline;hp=-c

Merge branch 'jc/index-extended-flags'

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

0a8eb7bae5101a3c1f550d67f1d4c0879dd417da
diff --combined cache.h
index 68ce6e686f,7b5cc834ab..928ae9f148
--- a/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);