undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/nostat'

Browse Source 
* jc/nostat:
  cache_name_compare() compares name and stage, nothing else.
This commit is contained in:
Junio C Hamano 2006-02-13 02:38:12 -08:00
commit eac6c04ca5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
read-cache.c
View File

@ -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;