t2200, t7004: Avoid glob pattern that also matches files

[git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 9fe0cd5f9b4e39dc8685a29c293a6138c02dcf4f..86e28650b887b4fcc1b05cc4d3102367df18a9ac 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -49,7 +49,7 @@ static void add_entry(struct unpack_trees_options *o, struct cache_entry *ce,
        memcpy(new, ce, size);
        new->next = NULL;
        new->ce_flags = (new->ce_flags & ~clear) | set;
-       add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE|ADD_CACHE_SKIP_DFCHECK);
+       add_index_entry(&o->result, new, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
 }
 
 /*
@@ -266,9 +266,9 @@ static int unpack_nondirectories(int n, unsigned long mask,
        if (o->merge)
                return call_unpack_fn(src, o);
 
-       n += o->merge;
        for (i = 0; i < n; i++)
-               add_entry(o, src[i], 0, 0);
+               if (src[i] && src[i] != o->df_conflict_entry)
+                       add_entry(o, src[i], 0, 0);
        return 0;
 }
 
@@ -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;