dir.c: export excluded_1() and add_excludes_from_file_1()

diff --git a/unpack-trees.c b/unpack-trees.c
index 3eda26359018b5e33fccf6e7b55dc13db7c748a1..dc6d74a16bd860709a5ede561b7b5c47d1b7b283 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -680,6 +680,8 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,
                } else {
                        if (verify_uptodate(old, o))
                                return -1;
+                       if (ce_skip_worktree(old))
+                               update |= CE_SKIP_WORKTREE;
                        invalidate_ce_path(old, o);
                }
        }