Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Sparse Index] Enable index.sparse by default #388

Merged
merged 7 commits into from
Jun 25, 2021
Merged

[Sparse Index] Enable index.sparse by default #388

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d5e328
repo-settings: enable sparse index by default
derrickstolee Jun 15, 2021
f35a590
sparse-index: silently return when not using cone-mode patterns
derrickstolee Jun 21, 2021
d27092a
fixup! fixup! dir.c: accept a directory as part of cone-mode patterns
derrickstolee Jun 21, 2021
bf3f351
sparse-index: recompute cache-tree
derrickstolee Jun 22, 2021
a9e2950
sparse-index: silently return when cache tree fails
derrickstolee Jun 23, 2021
47169a5
sparse-index: use WRITE_TREE_MISSING_OK when updating cache-tree
derrickstolee Jun 25, 2021
60d2ceb
fixup! fixup! fixup! dir.c: accept a directory as part of cone-mode p…
derrickstolee Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1420,7 +1420,7 @@ enum pattern_match_result path_matches_pattern_list(
struct path_pattern *pattern;
struct strbuf parent_pathname = STRBUF_INIT;
int result = NOT_MATCHED;
const char *slash_pos;
size_t slash_pos;

/*
* The virtual file system data is used to prevent git from traversing
Expand Down Expand Up @@ -1461,10 +1461,10 @@ enum pattern_match_result path_matches_pattern_list(
*/
if (parent_pathname.len > 0 &&
parent_pathname.buf[parent_pathname.len - 1] == '/') {
slash_pos = parent_pathname.buf + parent_pathname.len - 1;
slash_pos = parent_pathname.len - 1;
strbuf_add(&parent_pathname, "-", 1);
} else {
slash_pos = strrchr(parent_pathname.buf, '/');
slash_pos = strrchr(parent_pathname.buf, '/') - parent_pathname.buf;
derrickstolee marked this conversation as resolved.
Show resolved Hide resolved
}

if (hashmap_contains_path(&pl->recursive_hashmap,
Expand All @@ -1473,13 +1473,13 @@ enum pattern_match_result path_matches_pattern_list(
goto done;
}

if (slash_pos == parent_pathname.buf) {
if (!slash_pos) {
/* include every file in root */
result = MATCHED;
goto done;
}

strbuf_setlen(&parent_pathname, slash_pos - parent_pathname.buf);
strbuf_setlen(&parent_pathname, slash_pos);

if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
result = MATCHED;
Expand Down