diff options
| author | Kay Sievers <kay.sievers@vrfy.org> | 2005-05-06 15:45:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-06 08:41:12 -0700 |
| commit | ffbe1addd5a5b7b7c2f987625a5aa6c1d22e3705 (patch) | |
| tree | 68127262b118858d0dc4d898a3b89d78be6180cf /read-cache.c | |
| parent | 20d37ef67286e5131d2333d7b4662bc70f9d4937 (diff) | |
| download | git-ffbe1addd5a5b7b7c2f987625a5aa6c1d22e3705.tar.gz git-ffbe1addd5a5b7b7c2f987625a5aa6c1d22e3705.tar.xz | |
[PATCH] fix compare symlink against readlink not data
Fix update-cache to compare the blob of a symlink against the link-target
and not the file it points to. Also ignore all permissions applied to
links.
Thanks to Greg for recognizing this while he added our list of symlinks
back to the udev repository.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'read-cache.c')
| -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 5703f30b6..2a88d18b1 100644 --- a/read-cache.c +++ b/read-cache.c @@ -16,6 +16,9 @@ int cache_match_stat(struct cache_entry *ce, struct stat *st) switch (ntohl(ce->ce_mode) & S_IFMT) { case S_IFREG: changed |= !S_ISREG(st->st_mode) ? TYPE_CHANGED : 0; + /* We consider only the owner x bit to be relevant for "mode changes" */ + if (0100 & (ntohl(ce->ce_mode) ^ st->st_mode)) + changed |= MODE_CHANGED; break; case S_IFLNK: changed |= !S_ISLNK(st->st_mode) ? TYPE_CHANGED : 0; @@ -43,9 +46,6 @@ int cache_match_stat(struct cache_entry *ce, struct stat *st) if (ce->ce_uid != htonl(st->st_uid) || 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 & (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)) changed |= INODE_CHANGED; |