From 95fd5bf82ae28da47dcbf8e6e4570e64d71dc532 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 15 Apr 2005 22:51:44 -0700 Subject: Make cache entry comparison take the new "state" flag into account. This is what allows us to have multiple states of the same file in the index, and what makes it always sort correctly. --- cache.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cache.h') diff --git a/cache.h b/cache.h index bce48b00df..cc8f686b66 100644 --- a/cache.h +++ b/cache.h @@ -63,9 +63,10 @@ struct cache_entry { char name[0]; }; -#define CE_NAMEMASK (0x0fff) -#define CE_STAGE1 (0x1000) -#define CE_STAGE2 (0x2000) +#define CE_NAMEMASK (0x0fff) +#define CE_STAGEMASK (0x3000) + +#define create_ce_flags(len, stage) ((len) | ((stage) << 12)) const char *sha1_file_directory; struct cache_entry **active_cache; -- cgit v1.2.3