[PATCH] Fix +x-related show-diff false positives

This fixes show-diff listing all +x files as differring.

Signed-off-by: Petr Baudis <pasky@ucw.cz>
[ That's what I get for working on a G5 - my testing was all
big-endian in the first place.  -- Linus ]

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/read-cache.c b/read-cache.c
index 03d49e1026282d51c93c0a1b6ea1bdd16f41fc49..042b0c2107330c35731a4d42c9907e0b34ad5257 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -304,7 +304,7 @@ int cache_match_stat(struct cache_entry *ce, struct stat *st)
            ce->ce_gid != htonl(st->st_gid))
                changed |= OWNER_CHANGED;
        /* We consider only the owner x bit to be relevant for "mode changes" */
-       if (0100 & (ntohs(ce->ce_mode) ^ st->st_mode))
+       if (0100 & (ntohl(ce->ce_mode) ^ st->st_mode))
                changed |= MODE_CHANGED;
        if (ce->ce_dev != htonl(st->st_dev) ||
            ce->ce_ino != htonl(st->st_ino))