diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-12 23:46:25 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-12 23:46:25 -0800 |
| commit | 7b80be150ce137a790f498a69a784d61d8fc2e78 (patch) | |
| tree | 1c5b16907634986809a6e5802534e19a4f13c38f | |
| parent | f9666adfead47d265a65c7ba6f90d0ebae3e6b21 (diff) | |
| download | git-7b80be150ce137a790f498a69a784d61d8fc2e78.tar.gz git-7b80be150ce137a790f498a69a784d61d8fc2e78.tar.xz | |
cache_name_compare() compares name and stage, nothing else.
The code was a bit unclear in expressing what it wants to compare.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | read-cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/read-cache.c b/read-cache.c index efbb1be87..f97f92d90 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; |