More work on merging with git-read-tree..

diff --git a/cache.h b/cache.h
index 7cb5b554b3de43bacbcfeaf328481c58ec98888c..aa901d1f4669a6c615a70a924b119ded1fe7f464 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -84,6 +84,7 @@ struct cache_entry {
 
 #define CE_NAMEMASK  (0x0fff)
 #define CE_STAGEMASK (0x3000)
+#define CE_UPDATE    (0x4000)
 #define CE_STAGESHIFT 12
 
 #define create_ce_flags(len, stage) htons((len) | ((stage) << CE_STAGESHIFT))