Merge branch 'np/delta' into next

diff --git a/read-cache.c b/read-cache.c
index efbb1be8748019785f774dab4e5580db39292385..f97f92d90a6d6f8359dcb4c25988fe623fd4dd65 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -246,9 +246,9 @@ int cache_name_compare(const char *name1, int flags1, const char *name2, int fla
        if (len1 > len2)
                return 1;
 
-       /* Differences between "assume up-to-date" should not matter. */
-       flags1 &= ~CE_VALID;
-       flags2 &= ~CE_VALID;
+       /* Compare stages  */
+       flags1 &= CE_STAGEMASK;
+       flags2 &= CE_STAGEMASK;
 
        if (flags1 < flags2)
                return -1;