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

Add a "-u" flag to update the tree as a result of a merge. Right now this code is way too anal about things, and fails merges it shouldn't, but let me fix up the different cases and this will allow for much smoother merging even in the presense of dirty data in the working tree.
2005-06-05 22:07:31 -07:00
parent 12dccc1654
commit 220a0b527b
3 changed files with 107 additions and 23 deletions
--- 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))