summaryrefslogtreecommitdiff
path: root/dir.c
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2019-11-21 22:04:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-11-22 07:11:44 (GMT)
commiteb42feca974a333e58c2ca0f3cfa8bf0dd421402 (patch)
tree5e9e8425ec5a8f1b9cffd3fb9226d3457a31f927 /dir.c
parentaf09ce24a9c79f6efc12d1d8f1052e1d1dbe5016 (diff)
downloadgit-eb42feca974a333e58c2ca0f3cfa8bf0dd421402.zip
git-eb42feca974a333e58c2ca0f3cfa8bf0dd421402.tar.gz
git-eb42feca974a333e58c2ca0f3cfa8bf0dd421402.tar.bz2
unpack-trees: hash less in cone mode
The sparse-checkout feature in "cone mode" can use the fact that the recursive patterns are "connected" to the root via parent patterns to decide if a directory is entirely contained in the sparse-checkout or entirely removed. In these cases, we can skip hashing the paths within those directories and simply set the skipworktree bit to the correct value. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
-rw-r--r--dir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dir.c b/dir.c
index 35c1ca9..2ef92a5 100644
--- a/dir.c
+++ b/dir.c
@@ -1270,7 +1270,7 @@ enum pattern_match_result path_matches_pattern_list(
if (hashmap_contains_path(&pl->recursive_hashmap,
&parent_pathname)) {
- result = MATCHED;
+ result = MATCHED_RECURSIVE;
goto done;
}
@@ -1292,7 +1292,7 @@ enum pattern_match_result path_matches_pattern_list(
if (hashmap_contains_parent(&pl->recursive_hashmap,
pathname,
&parent_pathname))
- result = MATCHED;
+ result = MATCHED_RECURSIVE;
done:
strbuf_release(&parent_pathname);