Merge branch 'ab/nuke-emacs-contrib' into next

diff --git a/unpack-trees.c b/unpack-trees.c
index d5685891a560d2f1a06c937043ceda2c8b9fd9db..31a2cf2d0b5422b6c046da1a5f7600557b75977c 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1508,8 +1508,8 @@ static int verify_uptodate_1(const struct cache_entry *ce,
                add_rejected_path(o, error_type, ce->name);
 }
 
-static int verify_uptodate(const struct cache_entry *ce,
-                          struct unpack_trees_options *o)
+int verify_uptodate(const struct cache_entry *ce,
+                   struct unpack_trees_options *o)
 {
        if (!o->skip_sparse_checkout && (ce->ce_flags & CE_NEW_SKIP_WORKTREE))
                return 0;