diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2021-07-14 13:12:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-14 20:42:49 (GMT) |
| commit | bd6a3fd7f1ab698c7ed1222c70a7a0f6a6592bd8 (patch) | |
| tree | f06ac8782c6c2ba5c93a96436f33aae18ad55bd6 /unpack-trees.c | |
| parent | cd807a5cdabe5720071d91801dbc76faa8a643ba (diff) | |
| download | git-bd6a3fd7f1ab698c7ed1222c70a7a0f6a6592bd8.zip git-bd6a3fd7f1ab698c7ed1222c70a7a0f6a6592bd8.tar.gz git-bd6a3fd7f1ab698c7ed1222c70a7a0f6a6592bd8.tar.bz2 | |
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>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index b113cc7..d26386c 100644 --- 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]) { |