Merge branch 'master' into pb/gitpm

diff --git a/read-cache.c b/read-cache.c
index c0b031367bf0d33e535cdfc183da2276577c8011..f92cdaacee1b43bf09929e7072c281dbcbb09c10 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -61,7 +61,7 @@ static int ce_compare_data(struct cache_entry *ce, struct stat *st)
                unsigned char sha1[20];
                if (!index_fd(sha1, fd, st, 0, NULL))
                        match = memcmp(sha1, ce->sha1, 20);
-               close(fd);
+               /* index_fd() closed the file descriptor already */
        }
        return match;
 }