From 7b80be150ce137a790f498a69a784d61d8fc2e78 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 12 Feb 2006 23:46:25 -0800 Subject: [PATCH] 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 --- read-cache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/read-cache.c b/read-cache.c index efbb1be874..f97f92d90a 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; -- 2.11.4.GIT