unpack-trees: rename unpack_nondirectories()

In the next change, we will use this method to unpack a sparse directory
entry, so change the name to unpack_single_entry() so these entries
apply. The new name reflects that we will not recurse into trees in
order to resolve the conflicts.

Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/unpack-trees.c b/unpack-trees.c
index b113cc750f2e178037ccffbb8bbbf4c72d3e2c94..d26386ce8b228e3c81af091f26c761b6856313b0 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -804,7 +804,7 @@ static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
                BUG("We need cache-tree to do this optimization");
 
        /*
-        * Do what unpack_callback() and unpack_nondirectories() normally
+        * Do what unpack_callback() and unpack_single_entry() normally
         * do. But we walk all paths in an iterative loop instead.
         *
         * D/F conflicts and higher stage entries are not a concern
@@ -1075,11 +1075,11 @@ static struct cache_entry *create_ce_entry(const struct traverse_info *info,
  * without actually calling it. If you change the logic here you may need to
  * check and change there as well.
  */
-static int unpack_nondirectories(int n, unsigned long mask,
-                                unsigned long dirmask,
-                                struct cache_entry **src,
-                                const struct name_entry *names,
-                                const struct traverse_info *info)
+static int unpack_single_entry(int n, unsigned long mask,
+                              unsigned long dirmask,
+                              struct cache_entry **src,
+                              const struct name_entry *names,
+                              const struct traverse_info *info)
 {
        int i;
        struct unpack_trees_options *o = info->data;
@@ -1322,7 +1322,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
                }
        }
 
-       if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
+       if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0)
                return -1;
 
        if (o->merge && src[0]) {