Make cache entry comparison take the new "state" flag into account.

diff --git a/read-cache.c b/read-cache.c
index 4173b4e454f2a44babedd753894f7ba65ab56880..acc6e236d307c87a20468b25a765426eaebb5137 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -313,8 +313,10 @@ int cache_match_stat(struct cache_entry *ce, struct stat *st)
        return changed;
 }
 
-int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
+int cache_name_compare(const char *name1, int flags1, const char *name2, int flags2)
 {
+       int len1 = flags1 & CE_NAMEMASK;
+       int len2 = flags2 & CE_NAMEMASK;
        int len = len1 < len2 ? len1 : len2;
        int cmp;
 
@@ -325,6 +327,10 @@ int cache_name_compare(const char *name1, int len1, const char *name2, int len2)
                return -1;
        if (len1 > len2)
                return 1;
+       if (flags1 < flags2)
+               return -1;
+       if (flags1 > flags2)
+               return 1;
        return 0;
 }
 
@@ -337,7 +343,7 @@ int cache_name_pos(const char *name, int namelen)
        while (last > first) {
                int next = (last + first) >> 1;
                struct cache_entry *ce = active_cache[next];
-               int cmp = cache_name_compare(name, namelen, ce->name, ce_namelen(ce));
+               int cmp = cache_name_compare(name, namelen, ce->name, htons(ce->ce_flags));
                if (!cmp)
                        return next;
                if (cmp < 0) {
@@ -364,7 +370,7 @@ int add_cache_entry(struct cache_entry *ce, int ok_to_add)
 {
        int pos;
 
-       pos = cache_name_pos(ce->name, ce_namelen(ce));
+       pos = cache_name_pos(ce->name, htons(ce->ce_flags));
 
        /* existing match? Just replace it */
        if (pos >= 0) {