Merge branch 'db/maint-missing-origin'

[git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 273b5da0a256337c3d3973b475e7cfa567cee35a..da2e3c09158195e98c20a08fb97f9b37a5d5a5a5 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -360,8 +360,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 
        memset(&o->result, 0, sizeof(o->result));
        o->result.initialized = 1;
-       if (o->src_index)
-               o->result.timestamp = o->src_index->timestamp;
+       if (o->src_index) {
+               o->result.timestamp.sec = o->src_index->timestamp.sec;
+               o->result.timestamp.nsec = o->src_index->timestamp.nsec;
+       }
        o->merge_size = len;
 
        if (!dfc)
@@ -426,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)) {