Merge branch 'maint-1.6.3' into maint

[git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index ae75eacbcc00cd7d27d415c91eac5b819db4221e..ad2a4cde74e0c2ec6367a7128aa0732f131f6bdf 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -214,7 +214,7 @@ static int get_stat_data(struct cache_entry *ce,
        const unsigned char *sha1 = ce->sha1;
        unsigned int mode = ce->ce_mode;
 
-       if (!cached) {
+       if (!cached && !ce_uptodate(ce)) {
                int changed;
                struct stat st;
                changed = check_removed(ce, &st);