X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-cache.c;fp=read-cache.c;h=f97f92d90a6d6f8359dcb4c25988fe623fd4dd65;hb=7b80be150ce137a790f498a69a784d61d8fc2e78;hp=efbb1be8748019785f774dab4e5580db39292385;hpb=f9666adfead47d265a65c7ba6f90d0ebae3e6b21;p=git.git diff --git a/read-cache.c b/read-cache.c index efbb1be8..f97f92d9 100644 --- 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;