read-cache: store in-memory flags in the first 12 bits of ce_flags
We're running out of room for in-memory flags. But since b60e188 (Strip namelen out of ce_flags into a ce_namelen field - 2012-07-11), we copy the namelen (first 12 bits) to ce_namelen field. So those bits are free to use. Just make sure we do not accidentally write any in-memory flags back. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Jun 13, 2014 at 19:19 UTC
ce51bf09f8f0de70673b7cbdbc0e0df0b07e1def
2 files changed
+2
-2
cache.h
+1
-1
@@ -145,7 +145,7 @@ struct cache_entry {
145
#define CE_STAGESHIFT 12
146
147
/*
148
- * Range 0xFFFF0000 in ce_flags is divided into
148
+ * Range 0xFFFF0FFF in ce_flags is divided into
149
* two parts: in-memory flags and on-disk ones.
150
* Flags in CE_EXTENDED_FLAGS will get saved on-disk
151
* if you want to save a new flag, add it in
read-cache.c
+1
-1
@@ -1702,7 +1702,7 @@ static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
1702
ondisk->size = htonl(ce->ce_stat_data.sd_size);
1703
hashcpy(ondisk->sha1, ce->sha1);
1704
1705
- flags = ce->ce_flags;
1705
+ flags = ce->ce_flags & ~CE_NAMEMASK;
1706
flags |= (ce_namelen(ce) >= CE_NAMEMASK ? CE_NAMEMASK : ce_namelen(ce));
1707
ondisk->flags = htons(flags);
1708
if (ce->ce_flags & CE_EXTENDED) {