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>
Derrick Stolee committed
Jul 14, 2021 at 13:12 UTC
bd6a3fd7f1ab698c7ed1222c70a7a0f6a6592bd8
1 file changed
+7
-7
unpack-trees.c
+7
-7
@@ -804,7 +804,7 @@ static int traverse_by_cache_tree(int pos, int nr_entries, int nr_names,
804
BUG("We need cache-tree to do this optimization");
805
806
/*
807
- * Do what unpack_callback() and unpack_nondirectories() normally
807
+ * Do what unpack_callback() and unpack_single_entry() normally
808
* do. But we walk all paths in an iterative loop instead.
809
*
810
* 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,
1075
* without actually calling it. If you change the logic here you may need to
1076
* check and change there as well.
1077
*/
1078
-static int unpack_nondirectories(int n, unsigned long mask,
1079
- unsigned long dirmask,
1080
- struct cache_entry **src,
1081
- const struct name_entry *names,
1082
- const struct traverse_info *info)
1078
+static int unpack_single_entry(int n, unsigned long mask,
1079
+ unsigned long dirmask,
1080
+ struct cache_entry **src,
1081
+ const struct name_entry *names,
1082
+ const struct traverse_info *info)
1083
{
1084
int i;
1085
struct unpack_trees_options *o = info->data;
@@ -1322,7 +1322,7 @@ static int unpack_callback(int n, unsigned long mask, unsigned long dirmask, str
1322
}
1323
}
1324
1325
- if (unpack_nondirectories(n, mask, dirmask, src, names, info) < 0)
1325
+ if (unpack_single_entry(n, mask, dirmask, src, names, info) < 0)
1326
return -1;
1327
1328
if (o->merge && src[0]) {