From: Petr Baudis Date: Sun, 17 Apr 2005 11:44:51 GMT Subject: [PATCH] Fix +x-related show-diff false positives Message-ID: <20050417114451.GB1487@pasky.ji.cz> Hi, the following patch fixes show-diff listing all +x files as differring. Signed-off-by: Petr Baudis --- read-cache.c +++ read-cache.c 2005-04-17 13:42:13.322938268 +0200 @@ -306,7 +306,7 @@ 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)) (It is against my tree, but I think it should apply cleanly to yours too; perhaps with a tiny offset.) Kind regards, -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor