Merge branch 'kb/checkout-optim'

diff --git a/unpack-trees.c b/unpack-trees.c
index 11902cd51da9d83952df03edc1aadffc41e3f05b..da2e3c09158195e98c20a08fb97f9b37a5d5a5a5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -362,9 +362,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
        o->result.initialized = 1;
        if (o->src_index) {
                o->result.timestamp.sec = o->src_index->timestamp.sec;
-#ifdef USE_NSEC
                o->result.timestamp.nsec = o->src_index->timestamp.nsec;
-#endif
        }
        o->merge_size = len;
 
@@ -430,7 +428,7 @@ static int verify_uptodate(struct cache_entry *ce,
 {
        struct stat st;
 
-       if (o->index_only || o->reset)
+       if (o->index_only || o->reset || ce_uptodate(ce))
                return 0;
 
        if (!lstat(ce->name, &st)) {