merge-recursive: fix overwriting dirty files involved in renames

diff --git a/unpack-trees.c b/unpack-trees.c
index bf8b6029013c31000d83d6292f83ce0d0021d5d4..5b922c19392146f61cec1a9e137b7645bab6eca6 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1486,8 +1486,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;