Merge branch 'en/rename-directory-detection-reboot'

diff --git a/unpack-trees.c b/unpack-trees.c
index dec37ad1e7409aa6814cd22c914e05bcd9babf1d..3b6c3eeccd00de82606279b99a4a82aa906c199f 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1509,8 +1509,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;